autoconf: sync versions

2 files changed, 27 insertions, 29 deletions

diff --git a/repos/autotools/autotools-git/autoconf/autoconf.spec b/repos/autotools/autotools-git/autoconf/autoconf.spec
index 12b7097..8f07ad7 100644
--- a/repos/autotools/autotools-git/autoconf/autoconf.spec
+++ b/repos/autotools/autotools-git/autoconf/autoconf.spec
@@ -12,18 +12,13 @@ Summary:    A GNU tool for automatically configuring source code
 Name:       %{?scl_prefix}autoconf
 Version:    2.69
 # Do not reset Release tag to '1' when rebasing!
-Release:    11.%{commits_from_release}.%{git_hash}%{?dist}
+Release:    13.%{commits_from_release}.%{git_hash}%{?dist}
+Group:      Development/Tools
 License:    GPLv2+ and GFDL
 Source0:    autoconf-2.69.%{commits_from_release}-%{git_hash}-dirty.tar.gz
 URL:        http://www.gnu.org/software/autoconf/
 BuildArch: noarch
 
-%if ! 0%{?buildroot:1}
-# HACK!  This should be truth only for RHEL5, so benefit from
-# this %%if for defining (otherwise undefined) macro for this platform.
-%global rhel 5
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%endif
 
 # run "make check" by default
 %bcond_without check
@@ -34,7 +29,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # proper way.
 BuildRequires:      %{?scl_prefix}m4, help2man
 Requires:           %{?scl_prefix}m4
-BuildRequires:      emacs, compat-rpm-config
+BuildRequires:      emacs
 
 %{?_compat_br_perl_macros}
 
@@ -84,18 +79,18 @@ their use.
 
 
 %build
-scl enable autotools-git - <<\EOF
+%{?scl_enable}
 %configure
 # not parallel safe
 make
-EOF
+%{?scl_disable}
 
 
 %check
 %if %{with check}
-scl enable autotools-git - <<\EOF
+%{?scl_enable}
 make check || : # TESTSUITEFLAGS='1-198 200-' # will disable nr. 199.
-EOF
+%{?scl_disable}
 %endif
 
 
@@ -105,10 +100,10 @@ EOF
 %if 0%{?rhel} == 5
 rm -rf %{buildroot}
 %endif
-scl enable autotools-git - <<\EOF
+%{?scl_enable}
 make install DESTDIR=%{buildroot}
-EOF
 mkdir -p %{buildroot}/share
+%{?scl_disable}
 
 # Don't %%exclude this in %%files as it is not generated on RHEL7
 rm -rf %{buildroot}%{_infodir}/dir
@@ -140,6 +135,12 @@ fi
 %doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Mon Oct 10 2016 Pavel Raiskup <praiskup@redhat.com> - 2.69-13.161.ab30
+- simplify and unify with autotools-latest
+
+* Sun Oct 09 2016 Pavel Raiskup <praiskup@redhat.com> - 2.69-12.161.ab30
+- bump: rebuild october 2016
+
 * Fri Jun 17 2016 Pavel Raiskup <praiskup@redhat.com> - 2.69-10.161.ab30
 - rebase for latest git version
 
diff --git a/repos/autotools/autotools-latest/autoconf/autoconf.spec b/repos/autotools/autotools-latest/autoconf/autoconf.spec
index 3c2ad4e..1c40a93 100644
--- a/repos/autotools/autotools-latest/autoconf/autoconf.spec
+++ b/repos/autotools/autotools-latest/autoconf/autoconf.spec
@@ -7,7 +7,8 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       %{?scl_prefix}autoconf
 Version:    2.69
-Release:    7%{?dist}
+Release:    8%{?dist}
+Group:      Development/Tools
 License:    GPLv2+ and GFDL
 Source0:    http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.gz
 URL:        http://www.gnu.org/software/autoconf/
@@ -25,14 +26,7 @@ BuildRequires:      %{?scl_prefix}m4, help2man
 Requires:           %{?scl_prefix}m4
 BuildRequires:      emacs
 
-%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-BuildRequires: perl-macros
-%else
-%if 0%{?rhel} != 5
-# There is no macro filtering support on RHEL 5
-BuildRequires: perl-devel
-%endif
-%endif
+%{?_compat_br_perl_macros}
 
 BuildRequires:      perl(Data::Dumper)
 # from f19, Text::ParseWords is not the part of 'perl' package
@@ -80,18 +74,18 @@ their use.
 
 
 %build
-scl enable autotools-latest - <<\EOF
+%{?scl_enable}
 %configure
 # not parallel safe
 make
-EOF
+%{?scl_disable}
 
 
 %check
 %if %{with check}
-scl enable autotools-latest - <<\EOF
+%{?scl_enable}
 make check # TESTSUITEFLAGS='1-198 200-' # will disable nr. 199.
-EOF
+%{?scl_disable}
 %endif
 
 
@@ -101,10 +95,10 @@ EOF
 %if 0%{?rhel} == 5
 rm -rf %{buildroot}
 %endif
-scl enable autotools-latest - <<\EOF
+%{?scl_enable}
 make install DESTDIR=%{buildroot}
-EOF
 mkdir -p %{buildroot}/share
+%{?scl_disable}
 
 # Don't %%exclude this in %%files as it is not generated on RHEL7
 rm -rf %{buildroot}%{_infodir}/dir
@@ -136,6 +130,9 @@ fi
 %doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Mon Oct 10 2016 Pavel Raiskup <praiskup@redhat.com> - 2.69-8
+- simplify and unify with autotools-git
+
 * Sun Oct 09 2016 Pavel Raiskup <praiskup@redhat.com> - 2.69-7
 - bump: rebuild september 2016