[automake] testsuite: don't resist on looping order through hashes

[Pavel Raiskup]

commit bb142fca2c604760395eb087d6a0aa904f454a16
Author: Pavel Raiskup <praiskup at redhat.com>
Date:   Mon Jul 22 18:45:27 2013 +0200

    testsuite: don't resist on looping order through hashes
    
    Fixes build fail for Perl 5.18+.
    
    Version: 1.13.4-3

 automake-1.13.4-hash-order-workaround.patch |   16 ++++++++++++++++
 automake.spec                               |   14 +++++++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/automake-1.13.4-hash-order-workaround.patch b/automake-1.13.4-hash-order-workaround.patch
new file mode 100644
index 0000000..a89d299
--- /dev/null
+++ b/automake-1.13.4-hash-order-workaround.patch
@@ -0,0 +1,16 @@
+diff --git a/t/primary-prefix-invalid-couples.tap b/t/primary-prefix-invalid-couples.tap
+index 64f11f8..09b332a 100644
+--- a/t/primary-prefix-invalid-couples.tap
++++ b/t/primary-prefix-invalid-couples.tap
+@@ -186,8 +186,10 @@ grep -v 'dir.* not a legitimate directory' stderr && exit 1
+ # Check that the same failures are present without the '--add-missing'
+ # option.
+ mv stderr stderr.old
++cat stderr.old | sort > a
+ AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples"
++cat stderr | sort > b
+ command_ok_ "... and with the same diagnostic of 'automake -a'" \
+-            diff stderr.old stderr
++            diff a b
+ 
+ :
diff --git a/automake.spec b/automake.spec
index adefb44..9b02d76 100644
--- a/automake.spec
+++ b/automake.spec
@@ -3,7 +3,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
 Version:    %{api_version}.4
-Release:    2%{?dist}
+Release:    3%{?dist}
 
 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:    GPLv2+ and GFDL and Public Domain and MIT
@@ -15,6 +15,14 @@ Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 # ~> downstream
 Patch0:     %{name}-1.13.1-disable-tests.patch
 
+# Something changed in Perl 5.18 and the testsuite started to fail because
+# of random looping in hashes items.  Upstream will probably start sorting of
+# hash items by default for this failing case ~> we just don't resist on its
+# order for now (only testsuite change).
+# ~> Downstream
+# ~> http://lists.gnu.org/archive/html/bug-automake/2013-07/msg00022.html
+Patch1:     %{name}-1.13.4-hash-order-workaround.patch
+
 URL:        http://www.gnu.org/software/automake/
 Requires:   autoconf >= 2.65
 
@@ -62,6 +70,7 @@ Makefiles.
 %prep
 %setup -q -n automake-%{version}
 %patch0 -p1 -b .disable_tests
+%patch1 -p1 -b .hash_order
 autoreconf -iv
 
 # Fedora only to add ppc64p7 (Power7 optimized) arch:
@@ -102,6 +111,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jul 22 2013 Pavel Raiskup <praiskup at redhat.com> - 1.13.4-3
+- testsuite fix for Perl 5.18 rebase
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1.13.4-2
 - Perl 5.18 rebuild