libtool: rebase back to 2.4.4

This reverts commit 1945f9971137e1c88aacca85e6168378ea8ed24f.

Version: 2.4.4-1
Resolves: #1159497

1 files changed, 21 insertions, 32 deletions

diff --git a/libtool.spec b/libtool.spec
index 805dfa3..894a19a 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -1,10 +1,12 @@
 # See the bug #429880
 %global gcc_version  %(gcc -dumpversion || echo "666")
 
+%{!?runselftest:%global runselftest     1}
+
 Summary: The GNU Portable Library Tool
 Name:    libtool
-Version: 2.4.2
-Release: 32%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 URL:     http://www.gnu.org/software/libtool/
 Group:   Development/Tools
@@ -12,22 +14,12 @@ Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
 
 # ~> downstream
-Patch0:  libtool-2.2.10-rpath.patch
-
-# Disable buggy tests for features we don't support.
-# ~> downstream
-Patch1:  libtool-2.4.2-TEMPORARY-disable-gcj-tests.patch
-
-# Run the 'tar --no-same-owner -xf' instead of 'tar -xf'
-# ~> #740079
-# ~> Downstream - tar is not used in upstream 'master' branch anymore, will be
-#    fixed in next release.
-Patch2:  libtool-2.4.2-tar-no-owner.patch
+# ~> remove possibly once #1158915 gets fixed somehow
+Patch0:  libtool-2.4.3-rpath.patch
 
-# powerpc*le-linux support
-# ~> upstream
-# ~> `git diff c37bc1a3..8a8dfaec m4/libtool.m4`
-Patch3:  libtool-2.4.2-powerpcle-linux.patch
+# ~> downstream (proposed)
+# ~> http://permalink.gmane.org/gmane.comp.gnu.libtool.patches/11808
+Patch1:  libtool-2.4.4-race-in-aclocal-autoheader-calls.patch
 
 # /usr/bin/libtool includes paths within gcc's versioned directories
 # Libtool must be rebuilt whenever a new upstream gcc is built
@@ -95,10 +87,9 @@ Static libraries and header files for development with ltdl.
 %prep
 %setup -n libtool-%{version} -q
 %patch0 -p1 -b .rpath
-%patch1 -p1 -b .temp-disable-gcj-test
-%patch2 -p1 -b .tar-no-same-owner
-%patch3 -p1 -b .ppc-le-support
+%patch1 -p1 -b .racy-testsuite
 
+autoreconf -v
 
 %build
 export CC=gcc
@@ -121,14 +112,11 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 
 make %{?_smp_mflags}
 
-for i in ChangeLog.1997 ChangeLog.1998 ChangeLog.1999 ChangeLog.2002; do
-  iconv -f ISO_8859-15 -t UTF8 $i > $i.tmp
-  mv -f $i.tmp $i
-done
-
 
 %check
-make check VERBOSE=yes
+%if 0%{?runselftest}
+make check VERBOSE=yes || { cat testsuite.log ; false ; }
+%endif
 
 
 %install
@@ -157,7 +145,6 @@ fi
 
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README THANKS TODO ChangeLog*
 %{_infodir}/libtool.info*.gz
 %{_mandir}/man1/libtool.1*
@@ -165,20 +152,19 @@ fi
 %{_bindir}/libtool
 %{_bindir}/libtoolize
 %{_datadir}/aclocal/*.m4
-%exclude %{_datadir}/libtool/libltdl
-%{_datadir}/libtool
+%dir %{_datadir}/libtool
+%{_datadir}/libtool/build-aux
 
 
 %files ltdl
-%defattr(-,root,root)
 %doc libltdl/COPYING.LIB
 %{_libdir}/libltdl.so.*
 
 
 %files ltdl-devel
-%defattr(-,root,root)
 %doc libltdl/README
-%{_datadir}/libtool/libltdl
+%{_datadir}/libtool
+%exclude %{_datadir}/libtool/build-aux
 %{_includedir}/ltdl.h
 %{_includedir}/libltdl
 # .so files without version must be in -devel subpackage
@@ -186,6 +172,9 @@ fi
 
 
 %changelog
+* Tue Feb 17 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.4-1
+- rebase again to 2.4.4
+
 * Fri Feb 06 2015 Jakub Jelinek <jakub@redhat.com> - 2.4.2-32
 - rebuilt for gcc 5.0.0