autotools-git/autotools-latest: merge fixes/hacks among versions

3 files changed, 26 insertions, 8 deletions

diff --git a/repos/autotools/autotools-git/autotools-git/autotools-git.spec b/repos/autotools/autotools-git/autotools-git/autotools-git.spec
index be11b1f..b21dcff 100644
--- a/repos/autotools/autotools-git/autotools-git/autotools-git.spec
+++ b/repos/autotools/autotools-git/autotools-git/autotools-git.spec
@@ -6,7 +6,7 @@
 Summary: Package that installs %scl
 Name: %scl_name
 Version: 1
-Release: 8%{?dist}
+Release: 9%{?dist}
 BuildArch: noarch
 License: GPLv2+
 Group: Applications/File
@@ -17,6 +17,9 @@ Requires: %{?scl_prefix}autoconf, %{?scl_prefix}libtool
 %{?scl:BuildRequires: iso-codes}
 
 %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
 
@@ -40,7 +43,9 @@ Package shipping essential scripts to work with %scl Software Collection.
 
 
 %install
+%if 0%{?rhel} == 5
 rm -rf %{buildroot}
+%endif
 
 mkdir -p %{buildroot}/%{_scl_scripts}/root
 
@@ -58,8 +63,6 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
 
 
 %files
-
-
 %if 0%{?fedora} >= 21
 %files runtime -f filelist
 %else
@@ -73,6 +76,9 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
 
 
 %changelog
+* Thu Apr 17 2014 Pavel Raiskup <praiskup@redhat.com> - 1-9
+- merge fixes with autotools-latest version
+
 * Tue Mar 25 2014 Pavel Raiskup <praiskup@redhat.com> - 1-8
 - buildroots are prepared, lets require all packages
 
diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec
index 38ed3de..c6ee2f7 100644
--- a/repos/autotools/autotools-git/libtool/libtool.spec
+++ b/repos/autotools/autotools-git/libtool/libtool.spec
@@ -12,7 +12,7 @@
 Summary: The GNU Portable Library Tool
 Name:    %{?scl_prefix}libtool
 Version: 2.4.2
-Release: 3.%{subrelease}.%{git_hash}%{?dist}
+Release: 4.%{subrelease}.%{git_hash}%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 URL:     http://www.gnu.org/software/libtool/
 Group:   Development/Tools
@@ -29,11 +29,13 @@ Requires: gcc = %{gcc_version}
 Requires: %{scl_prefix}autoconf, %{scl_prefix}automake, sed, tar, findutils
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
-%{?scl:Requires:%scl_runtime}
 
 BuildRequires: texinfo
 
-%{?scl:BuildRequires: scl-utils-build}
+%{?scl:
+BuildRequires: scl-utils-build
+Requires:%scl_runtime
+}
 
 %if ! 0%{?buildroot:1}
 # HACK!  This should be truth only for RHEL5, so benefit from
@@ -186,6 +188,9 @@ fi
 %{_libdir}/libltdl.so
 
 %changelog
+* Thu Apr 17 2014 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-4.444.28.053d
+- merge fixes/hakcs from other specs
+
 * Mon Mar 24 2014 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-3.444.28.053d
 - make spec RHEL5 friendly
 
diff --git a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
index fd26bbc..429bd15 100644
--- a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
+++ b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
@@ -6,7 +6,7 @@
 Summary: Package that installs %scl
 Name: %scl_name
 Version: 1
-Release: 5%{?dist}
+Release: 6%{?dist}
 BuildArch: noarch
 License: GPLv2+
 Group: Applications/File
@@ -17,6 +17,9 @@ Requires: %{?scl_prefix}autoconf, %{?scl_prefix}libtool
 %{?scl:BuildRequires: iso-codes}
 
 %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
 
@@ -38,6 +41,7 @@ Package shipping essential scripts to work with %scl Software Collection.
 %prep
 %setup -c -T
 
+
 %install
 %if 0%{?rhel} == 5
 rm -rf %{buildroot}
@@ -57,8 +61,8 @@ EOF
 cat %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
 rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
 
-%files
 
+%files
 %if 0%{?fedora} >= 21
 %files runtime -f filelist
 %else
@@ -72,6 +76,9 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
 
 
 %changelog
+* Thu Apr 17 2014 Pavel Raiskup <praiskup@redhat.com> - 1-6
+- merge fixes with autotools-git version
+
 * Tue Mar 25 2014 Pavel Raiskup <praiskup@redhat.com> - 1-5
 - buildroots are prepared, lets require all packages