libtool: enable scl during build properly

2 files changed, 23 insertions, 17 deletions

diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec
index edfd333..622f1d1 100644
--- a/repos/autotools/autotools-git/libtool/libtool.spec
+++ b/repos/autotools/autotools-git/libtool/libtool.spec
@@ -1,7 +1,6 @@
 %{?_compat_el5_build}
-
 %{!?scl:%global scl autotools-git}
-
+%{?sclize_package}
 
 # Detect gcc version, (workaround) see the bug #429880
 %global gcc_version  %(gcc -dumpversion || echo "666")
@@ -14,7 +13,7 @@
 Summary: The GNU Portable Library Tool
 Name:    %{?scl_prefix}libtool
 Version: %{upstream_vr}~git
-Release: 2.%{git_hash}%{?dist}
+Release: 4.%{git_hash}%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 URL:     http://www.gnu.org/software/libtool/
 Group:   Development/Tools
@@ -37,7 +36,7 @@ Requires:           %{?scl_prefix}m4
 BuildRequires: texinfo
 
 %{?scl:
-BuildRequires: scl-utils-build
+BuildRequires: scl-utils-build %{scl_prefix}-runtime
 Requires:%scl_runtime
 }
 
@@ -106,7 +105,7 @@ find -exec touch --date=`date -I` {} +
 
 
 %build
-scl enable autotools-git - <<\EOF
+%{?scl_heredoc}
 export CC=gcc
 export CXX=g++
 export F77=gfortran
@@ -127,7 +126,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC"
             --host= --build= --target=
 
 make %{?_smp_mflags}
-EOF
+%{?scl_heredoc_off}
 
 
 %check
@@ -135,9 +134,8 @@ EOF
 
 
 %install
-%if 0%{?rhel} == 5
-rm -rf %{builroot}
-%endif
+%{?scl_heredoc}
+%_compat_install
 make install DESTDIR=%{buildroot}
 
 # info's TOP dir (by default owned by info)
@@ -146,7 +144,7 @@ rm -f %{buildroot}%{_infodir}/dir
 # *.la *.a files generated by libtool shouldn't be distributed (and the
 # `./configure --disable-static' breaks testsuite)
 rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
-
+%{?scl_heredoc_off}
 
 %post
 /sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir || :
@@ -188,6 +186,9 @@ fi
 %{_libdir}/libltdl.so
 
 %changelog
+* Sun Dec 13 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.22~git-4.a5c64
+- make sure collection is enabled during %%install
+
 * Sun Dec 13 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.19~git-2.a5c64
 - rebase and rebuild for new gcc 5.3.1 in f22+
 
diff --git a/repos/autotools/autotools-latest/libtool/libtool.spec b/repos/autotools/autotools-latest/libtool/libtool.spec
index 718350f..880f66f 100644
--- a/repos/autotools/autotools-latest/libtool/libtool.spec
+++ b/repos/autotools/autotools-latest/libtool/libtool.spec
@@ -1,6 +1,7 @@
 %{?_compat_el5_build}
-
 %{!?scl:%global scl autotools-latest}
+%{?sclize_package}
+
 
 %global gcc_version  %(gcc -dumpversion || echo "666")
 
@@ -9,7 +10,7 @@
 Summary: The GNU Portable Library Tool
 Name:    %{?scl_prefix}libtool
 Version: 2.4.2
-Release: 11%{?dist}
+Release: 13%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 URL:     http://www.gnu.org/software/libtool/
 Group:   Development/Tools
@@ -45,7 +46,7 @@ BuildRequires: help2man
 BuildRequires: texinfo
 
 %{?scl:
-BuildRequires: scl-utils-build
+BuildRequires: scl-utils-build %{scl_prefix}-runtime
 Requires:%scl_runtime
 }
 
@@ -119,6 +120,7 @@ find -exec touch --date=`date -I` {} +
 
 
 %build
+%{?scl_heredoc}
 export CC=gcc
 export CXX=g++
 export F77=gfortran
@@ -139,6 +141,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC"
             --host= --build= --target=
 
 make %{?_smp_mflags}
+%{?scl_heredoc_off}
 
 for i in ChangeLog.1997 ChangeLog.1998 ChangeLog.1999 ChangeLog.2002; do
   iconv -f ISO_8859-15 -t UTF8 $i > $i.tmp
@@ -151,9 +154,8 @@ done
 
 
 %install
-%if 0%{?rhel} == 5
-rm -rf %{builroot}
-%endif
+%{?scl_heredoc}
+%_compat_install
 make install DESTDIR=%{buildroot}
 
 # info's TOP dir (by default owned by info)
@@ -162,7 +164,7 @@ rm -f %{buildroot}%{_infodir}/dir
 # *.la *.a files generated by libtool shouldn't be distributed (and the
 # `./configure --disable-static' breaks testsuite)
 rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
-
+%{?scl_heredoc_off}
 
 %post
 /sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir || :
@@ -204,6 +206,9 @@ fi
 %{_libdir}/libltdl.so
 
 %changelog
+* Sun Dec 13 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-13
+- make sure collection is enabled during %%install
+
 * Sun Dec 13 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-11
 - bump for new gcc in f22+