git/libtool: sync with fedora #1

1 files changed, 22 insertions, 7 deletions

diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec
index f2e8adc..b6933a5 100644
--- a/repos/autotools/autotools-git/libtool/libtool.spec
+++ b/repos/autotools/autotools-git/libtool/libtool.spec
@@ -1,21 +1,27 @@
+# See the bug #1289759
+%undefine _hardened_build
+
 %{?_compat_el5_build}
 %{!?scl:%{?autotools_scl_build:%global scl autotools-git}}
 %{?sclize_package}
 
-%{?scl:%global __provides_exclude ^libltdl\\.so.*$}
 
-# Detect gcc version, (workaround) see the bug #429880
-%global gcc_version  %(gcc -dumpversion || echo "666")
+%{?scl:%global __provides_exclude ^libltdl\\.so.*$}
 
 %global git_hash        08c5
 %global upstream_vr     2.4.6.34
 
 %{?scl:%scl_package libtool}
 
+# See the bug #429880
+%global gcc_version  %(gcc -dumpversion || echo "666")
+
+%bcond_with check
+
 Summary: The GNU Portable Library Tool
 Name:    %{?scl_prefix}libtool
 Version: %{upstream_vr}~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
@@ -112,6 +118,9 @@ export CXX=g++
 export F77=gfortran
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 
+# rhbz#1214506
+%global _configure_libtool_hardening_hack 0
+
 %configure  --prefix=%{_prefix}                 \
             --exec-prefix=%{_prefix}            \
             --bindir=%{_bindir}                 \
@@ -131,17 +140,17 @@ make %{?_smp_mflags}
 
 
 %check
-# make check VERBOSE=yes
+%if %{with check}
+make check VERBOSE=yes || { cat testsuite.log ; false ; }
+%endif
 
 
 %install
 %{?scl_heredoc}
 %{?_compat_install}
 make install DESTDIR=%{buildroot}
-
 # info's TOP dir (by default owned by info)
 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}
@@ -174,10 +183,12 @@ fi
 %exclude %{_datadir}/libtool/libltdl
 %{_datadir}/libtool
 
+
 %files ltdl
 %doc libltdl/COPYING.LIB
 %{_libdir}/libltdl.so.*
 
+
 %files ltdl-devel
 %doc libltdl/README
 %{_datadir}/libtool/libltdl
@@ -186,7 +197,11 @@ fi
 # .so files without version must be in -devel subpackage
 %{_libdir}/libltdl.so
 
+
 %changelog
+* Tue Jan 03 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.34~git-5.08c5
+- sync with fedora
+
 * Tue Jan 03 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.34~git-4.08c5
 - fixes that allows us to build outside from scls