libtool: revert to 2.4.2

This reverts commit 814b78bc804c033e5f1cf9475de39636af2275a1.
This reverts commit 6f9ef243b6dfe3a7572718c1c0b7922c27f721c7.
This reverts commit f6d9cfe433010677e31bdcd86a15abc3b962e7f0.

This is safe without epoch bumping because I did not build libtool
in f22 yet.

Related: #1159497
Version: 2.4.2-31

1 files changed, 32 insertions, 25 deletions

diff --git a/libtool.spec b/libtool.spec
index e41057c..7265d42 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -1,12 +1,10 @@
 # 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.4
-Release: 1%{?dist}
+Version: 2.4.2
+Release: 31%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 URL:     http://www.gnu.org/software/libtool/
 Group:   Development/Tools
@@ -14,12 +12,22 @@ Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
 
 # ~> downstream
-# ~> remove possibly once #1158915 gets fixed somehow
-Patch0:  libtool-2.4.3-rpath.patch
+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
 
-# ~> downstream (proposed)
-# ~> http://permalink.gmane.org/gmane.comp.gnu.libtool.patches/11808
-Patch1:  libtool-2.4.4-race-in-aclocal-autoheader-calls.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
+
+# powerpc*le-linux support
+# ~> upstream
+# ~> `git diff c37bc1a3..8a8dfaec m4/libtool.m4`
+Patch3:  libtool-2.4.2-powerpcle-linux.patch
 
 # /usr/bin/libtool includes paths within gcc's versioned directories
 # Libtool must be rebuilt whenever a new upstream gcc is built
@@ -87,9 +95,10 @@ Static libraries and header files for development with ltdl.
 %prep
 %setup -n libtool-%{version} -q
 %patch0 -p1 -b .rpath
-%patch1 -p1 -b .racy-testsuite
+%patch1 -p1 -b .temp-disable-gcj-test
+%patch2 -p1 -b .tar-no-same-owner
+%patch3 -p1 -b .ppc-le-support
 
-autoreconf -v
 
 %build
 export CC=gcc
@@ -112,11 +121,14 @@ 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
-%if 0%{?runselftest}
-make check VERBOSE=yes || { cat testsuite.log ; false ; }
-%endif
+make check VERBOSE=yes
 
 
 %install
@@ -145,6 +157,7 @@ fi
 
 
 %files
+%defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README THANKS TODO ChangeLog*
 %{_infodir}/libtool.info*.gz
 %{_mandir}/man1/libtool.1*
@@ -152,19 +165,20 @@ fi
 %{_bindir}/libtool
 %{_bindir}/libtoolize
 %{_datadir}/aclocal/*.m4
-%dir %{_datadir}/libtool
-%{_datadir}/libtool/build-aux
+%exclude %{_datadir}/libtool/libltdl
+%{_datadir}/libtool
 
 
 %files ltdl
+%defattr(-,root,root)
 %doc libltdl/COPYING.LIB
 %{_libdir}/libltdl.so.*
 
 
 %files ltdl-devel
+%defattr(-,root,root)
 %doc libltdl/README
-%{_datadir}/libtool
-%exclude %{_datadir}/libtool/build-aux
+%{_datadir}/libtool/libltdl
 %{_includedir}/ltdl.h
 %{_includedir}/libltdl
 # .so files without version must be in -devel subpackage
@@ -172,13 +186,6 @@ fi
 
 
 %changelog
-* Wed Jan 14 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.4-1
-- rebase to quick bugfix release 2.4.4 (2.4.5 will follow up)
-
-* Wed Jan 14 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.3-1
-- rebase per release notes:
-  http://lists.gnu.org/archive/html/autotools-announce/2014-10/msg00000.html
-
 * Sun Nov 02 2014 Jakub Jelinek <jakub@redhat.com> - 2.4.2-31
 - rebuilt for gcc 4.9.2