specs: use _compat_el5_build only if defined

10 files changed, 51 insertions, 21 deletions

diff --git a/repos/autotools/autotools-git/autoconf/autoconf.spec b/repos/autotools/autotools-git/autoconf/autoconf.spec
index b6f517f..c6be818 100644
--- a/repos/autotools/autotools-git/autoconf/autoconf.spec
+++ b/repos/autotools/autotools-git/autoconf/autoconf.spec
@@ -1,4 +1,4 @@
-%_compat_el5_build
+%{?_compat_el5_build}
 
 # Workaround to always have %scl defined (for testing locally)
 %{!?scl:%global scl autotools-git}
@@ -12,7 +12,7 @@ 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:    8.%{commits_from_release}.%{git_hash}%{?dist}
+Release:    9.%{commits_from_release}.%{git_hash}%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source0:    autoconf-2.69.%{commits_from_release}-%{git_hash}-dirty.tar.gz
@@ -37,7 +37,7 @@ BuildRequires:      %{?scl_prefix}m4, help2man
 Requires:           %{?scl_prefix}m4
 BuildRequires:      emacs, compat-rpm-config
 
-%_compat_br_perl_macros
+%{?_compat_br_perl_macros}
 
 BuildRequires:      perl(Data::Dumper)
 # from f19, Text::ParseWords is not the part of 'perl' package
@@ -141,6 +141,9 @@ fi
 %doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 2.69-9.120.5dcda
+- use _compat_el5_build only if defined (rhbz#1252751)
+
 * Sun Jun 15 2014 Pavel Raiskup <praiskup@redhat.com> - 2.69-8.120.5dcda
 - rebase for latest git version
 - enable testsuite (do not fail, though)
diff --git a/repos/autotools/autotools-git/automake/automake.spec b/repos/autotools/autotools-git/automake/automake.spec
index 76588fa..d072d01 100644
--- a/repos/autotools/autotools-git/automake/automake.spec
+++ b/repos/autotools/autotools-git/automake/automake.spec
@@ -1,4 +1,4 @@
-%_compat_el5_build
+%{?_compat_el5_build}
 
 # this is needed for el5 builders
 %global _source_filedigest_algorithm md5
@@ -18,7 +18,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       %{?scl_prefix}automake
 Version:    %{api_version}a
-Release:    11.%git_tag%{?dist}
+Release:    12.%git_tag%{?dist}
 
 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:    GPLv2+ and GFDL and Public Domain and MIT
@@ -180,6 +180,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1.99a-12.904253
+- use _compat_el5_build only if defined (rhbz#1252751)
+
 * Tue Jun 09 2015 Pavel Raiskup <praiskup@redhat.com> - 1.99a-11.904253
 - BR perl-Thread-Queue to fix help2man run
 
diff --git a/repos/autotools/autotools-git/autotools-git/autotools-git.spec b/repos/autotools/autotools-git/autotools-git/autotools-git.spec
index 648c922..fb1637a 100644
--- a/repos/autotools/autotools-git/autotools-git/autotools-git.spec
+++ b/repos/autotools/autotools-git/autotools-git/autotools-git.spec
@@ -1,4 +1,4 @@
-%_compat_el5_build
+%{?_compat_el5_build}
 
 # Workaround to always have %%scl defined
 %{!?scl:%global scl autotools-git}
@@ -8,7 +8,7 @@
 Summary: Package that installs %scl
 Name: %scl_name
 Version: 1
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group: Applications/File
 
@@ -101,6 +101,9 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
 
 
 %changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1-15
+- use _compat_el5_build only if defined (rhbz#1252751)
+
 * Tue Jun 23 2015 Pavel Raiskup <praiskup@redhat.com> - 1-14
 - make the meta-packages architecture dependant
 
diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec
index 8afb907..9cb90f8 100644
--- a/repos/autotools/autotools-git/libtool/libtool.spec
+++ b/repos/autotools/autotools-git/libtool/libtool.spec
@@ -1,4 +1,4 @@
-%_compat_el5_build
+%{?_compat_el5_build}
 
 %{!?scl:%global scl autotools-git}
 
@@ -14,7 +14,7 @@
 Summary: The GNU Portable Library Tool
 Name:    %{?scl_prefix}libtool
 Version: 2.4.5~git
-Release: 4.%{git_hash}%{?dist}
+Release: 5.%{git_hash}%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 URL:     http://www.gnu.org/software/libtool/
 Group:   Development/Tools
@@ -187,6 +187,9 @@ fi
 %{_libdir}/libltdl.so
 
 %changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.5~git-5.6289a
+- use _compat_el5_build only if defined (rhbz#1252751)
+
 * Sun Feb 08 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.5~git-4.6289a
 - rebuild for new gcc version in rawhide
 
diff --git a/repos/autotools/autotools-git/m4/m4.spec b/repos/autotools/autotools-git/m4/m4.spec
index 4cf1e67..fd4be2d 100644
--- a/repos/autotools/autotools-git/m4/m4.spec
+++ b/repos/autotools/autotools-git/m4/m4.spec
@@ -1,4 +1,4 @@
-%_compat_el5_build
+%{?_compat_el5_build}
 
 %{!?scl:%global scl autotools-git}
 
@@ -10,7 +10,7 @@
 Summary: The GNU macro processor
 Name: %{scl_prefix}m4
 Version: 1.9a
-Release: 4.%(echo %upstream_stamp | sed 's|-|_|')%{?dist}
+Release: 5.%(echo %upstream_stamp | sed 's|-|_|')%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source0: m4-%{version}.%{upstream_stamp}-dirty.tar.gz
@@ -92,6 +92,9 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1.9a-5.645_0dc1
+- use _compat_el5_build only if defined (rhbz#1252751)
+
 * Thu May 29 2014 Pavel Raiskup <praiskup@redhat.com> - 1.9a-4.645_0dc1
 - new tarball with applied downstream patches (to enable testsuite)
 
diff --git a/repos/autotools/autotools-latest/autoconf/autoconf.spec b/repos/autotools/autotools-latest/autoconf/autoconf.spec
index 0625d46..aa0bb49 100644
--- a/repos/autotools/autotools-latest/autoconf/autoconf.spec
+++ b/repos/autotools/autotools-latest/autoconf/autoconf.spec
@@ -1,4 +1,4 @@
-%_compat_el5_build
+%{?_compat_el5_build}
 
 %{!?scl:%global scl autotools-latest}
 
@@ -7,7 +7,7 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       %{?scl_prefix}autoconf
 Version:    2.69
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source0:    http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.gz
@@ -133,6 +133,9 @@ fi
 %doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 2.69-4
+- use _compat_el5_build only if defined (rhbz#1252751)
+
 * Thu May 29 2014 Pavel Raiskup <praiskup@redhat.com> - 2.69-3
 - release bump for %%_compat_el5_build
 
diff --git a/repos/autotools/autotools-latest/automake/automake.spec b/repos/autotools/autotools-latest/automake/automake.spec
index ae2258a..8316d38 100644
--- a/repos/autotools/autotools-latest/automake/automake.spec
+++ b/repos/autotools/autotools-latest/automake/automake.spec
@@ -1,4 +1,4 @@
-%_compat_el5_build
+%{?_compat_el5_build}
 
 # Workaround to always have %scl defined (for testing locally)
 
@@ -14,7 +14,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       %{?scl_prefix}automake
 Version:    %{api_version}
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:    GPLv2+ and GFDL and Public Domain and MIT
@@ -171,6 +171,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1.15-2
+- use _compat_el5_build only if defined (rhbz#1252751)
+
 * Tue Jun 23 2015 Pavel Raiskup <praiskup@redhat.com> - 1.15-1
 - rebase to latest upstream release
 
diff --git a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
index f68f3ad..ca97270 100644
--- a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
+++ b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
@@ -1,4 +1,4 @@
-%_compat_el5_build
+%{?_compat_el5_build}
 
 # Workaround to always have %%scl defined
 %{!?scl:%global scl autotools-latest}
@@ -8,7 +8,7 @@
 Summary: Package that installs %scl
 Name: %scl_name
 Version: 1
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group: Applications/File
 
@@ -99,6 +99,9 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
 
 
 %changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1-13
+- use _compat_el5_build only if defined (rhbz#1252751)
+
 * Tue Jun 23 2015 Pavel Raiskup <praiskup@redhat.com> - 1-12
 - make the meta-packages architecture dependant
 
diff --git a/repos/autotools/autotools-latest/libtool/libtool.spec b/repos/autotools/autotools-latest/libtool/libtool.spec
index 5b9d8d5..2544d1c 100644
--- a/repos/autotools/autotools-latest/libtool/libtool.spec
+++ b/repos/autotools/autotools-latest/libtool/libtool.spec
@@ -1,4 +1,4 @@
-%_compat_el5_build
+%{?_compat_el5_build}
 
 %{!?scl:%global scl autotools-latest}
 
@@ -9,7 +9,7 @@
 Summary: The GNU Portable Library Tool
 Name:    %{?scl_prefix}libtool
 Version: 2.4.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 URL:     http://www.gnu.org/software/libtool/
 Group:   Development/Tools
@@ -203,6 +203,9 @@ fi
 %{_libdir}/libltdl.so
 
 %changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-9
+- use _compat_el5_build only if defined (rhbz#1252751)
+
 * Sat Feb 07 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-8
 - rebuild for new gcc rawhide
 
diff --git a/repos/autotools/autotools-latest/m4/m4.spec b/repos/autotools/autotools-latest/m4/m4.spec
index bba12f4..e9e126d 100644
--- a/repos/autotools/autotools-latest/m4/m4.spec
+++ b/repos/autotools/autotools-latest/m4/m4.spec
@@ -1,4 +1,4 @@
-%_compat_el5_build
+%{?_compat_el5_build}
 
 %{!?scl:%global scl autotools-latest}
 
@@ -7,7 +7,7 @@
 Summary: The GNU macro processor
 Name: %{scl_prefix}m4
 Version: 1.4.17
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.gz
@@ -79,6 +79,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1.4.17-3
+- use _compat_el5_build only if defined (rhbz#1252751)
+
 * Thu May 29 2014 Pavel Raiskup <praiskup@redhat.com> - 1.4.17-2
 - release bump for %%_compat_el5_build