automake: bump october 2016

2 files changed, 20 insertions, 14 deletions

diff --git a/repos/autotools/autotools-git/automake/automake.spec b/repos/autotools/autotools-git/automake/automake.spec
index a5c9f78..8bea07f 100644
--- a/repos/autotools/autotools-git/automake/automake.spec
+++ b/repos/autotools/autotools-git/automake/automake.spec
@@ -14,7 +14,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       %{?scl_prefix}automake
 Version:    %{api_version}a
-Release:    15.%git_tag%{?dist}
+Release:    16.%git_tag%{?dist}
 
 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:    GPLv2+ and GFDL and Public Domain and MIT
@@ -119,18 +119,18 @@ perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" lib/config.sub
 %if 0%{?fedora} >= 21
 # disable replacing config.guess and config.sub from redhat-rpm-config
 %global _configure_gnuconfig_hack 0
-scl enable autotools-git - <<\EOF
+%{?scl_enable}
 %configure --docdir=%{_pkgdocdir}
 make %{?_smp_mflags}
-EOF
+%{?scl_disable}
 %else
 # Use ./configure where rhbz#991613 is not fixed
-scl enable autotools-git - <<EOF
+%{?scl_enable}
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
    --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir} \
    --docdir=%{_pkgdocdir} --disable-silent-rules
 make V=0 %{?_smp_mflags}
-EOF
+%{?scl_disable}
 %endif
 
 cp m4/acdir/README README.aclocal
@@ -139,9 +139,9 @@ cp contrib/multilib/README README.multilib
 %install
 %_compat_install
 
-scl enable autotools-git - <<EOF
+%{?scl_enable}
 make install DESTDIR=%{buildroot}
-EOF
+%{?scl_disable}
 
 # %%doc is broken on older RHEL systems so that even if we set --docdir to
 # %%_pkgdocdir by configure, procesing of %%doc removes whole %%_pkgdocdir and
@@ -178,6 +178,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 10 2016 Pavel Raiskup <praiskup@redhat.com> - 1.99a-16.6357a6
+- bump: rebuild october 2016
+
 * Fri Jun 17 2016 Pavel Raiskup <praiskup@redhat.com> - 1.99a-14.6357a6
 - rebase for latest git HEAD
 
diff --git a/repos/autotools/autotools-latest/automake/automake.spec b/repos/autotools/autotools-latest/automake/automake.spec
index 4826a80..20e6a2a 100644
--- a/repos/autotools/autotools-latest/automake/automake.spec
+++ b/repos/autotools/autotools-latest/automake/automake.spec
@@ -13,7 +13,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       %{?scl_prefix}automake
 Version:    %{api_version}
-Release:    5%{?dist}
+Release:    6%{?dist}
 
 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:    GPLv2+ and GFDL and Public Domain and MIT
@@ -120,18 +120,18 @@ perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" lib/config.sub
 %if 0%{?fedora} >= 21
 # disable replacing config.guess and config.sub from redhat-rpm-config
 %global _configure_gnuconfig_hack 0
-scl enable autotools-latest - <<\EOF
+%{?scl_enable}
 %configure --docdir=%{_pkgdocdir}
 make %{?_smp_mflags}
-EOF
+%{?scl_disable}
 %else
 # Use ./configure where rhbz#991613 is not fixed
-scl enable autotools-latest - <<EOF
+%{?scl_enable}
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
    --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir} \
    --docdir=%{_pkgdocdir} --disable-silent-rules
 make V=0 %{?_smp_mflags}
-EOF
+%{?scl_disable}
 %endif
 
 cp m4/acdir/README README.aclocal
@@ -140,9 +140,9 @@ cp contrib/multilib/README README.multilib
 %install
 %_compat_install
 
-scl enable autotools-latest - <<EOF
+%{?scl_enable}
 make install DESTDIR=%{buildroot}
-EOF
+%{?scl_disable}
 
 # %%doc is broken on older RHEL systems so that even if we set --docdir to
 # %%_pkgdocdir by configure, procesing of %%doc removes whole %%_pkgdocdir and
@@ -179,6 +179,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 10 2016 Pavel Raiskup <praiskup@redhat.com> - 1.15-6
+- bump: rebuild october 2016
+
 * Fri Jun 17 2016 Pavel Raiskup <praiskup@redhat.com> - 1.15-5
 - bump