Accepting request 195477 from home:AndreasStieger:branches:devel:tools:building

Fix automake-testsuite in Factory

OBS-URL: https://build.opensuse.org/request/show/195477
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=38

automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch

@@ -0,0 +1,26 @@
+From: Andreas Stieger <andreas.stieger@gmx.de>
+Subject: fix test failures in openSUSE Factory
+Date: Fri, 16 Aug 2013 22:59:41 +0100
+Upstream: no
+
+The test suite fails for factory comparing the output of two command runs.
+As only the content is relevant, not the order, sort befor diffing to fix.
+
+---
+ t/primary-prefix-invalid-couples.tap |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: automake-1.13.4/t/primary-prefix-invalid-couples.tap
+===================================================================
+--- automake-1.13.4.orig/t/primary-prefix-invalid-couples.tap	2013-06-09 10:31:22.000000000 +0100
++++ automake-1.13.4/t/primary-prefix-invalid-couples.tap	2013-08-16 22:09:29.000000000 +0100
+@@ -186,7 +186,9 @@ grep -v 'dir.* not a legitimate director
+ # Check that the same failures are present without the '--add-missing'
+ # option.
+ mv stderr stderr.old
++sort stderr.old -o stderr.old
+ AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples"
++sort stderr -o stderr
+ command_ok_ "... and with the same diagnostic of 'automake -a'" \
+             diff stderr.old stderr
+ 

automake-testsuite.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 16 21:10:46 UTC 2013 - andreas.stieger@gmx.de
+
+- fix tests on factory
+  automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
+
 -------------------------------------------------------------------
 Mon Jun 17 13:43:50 CEST 2013 - pth@suse.de
 
@@ -6,6 +12,7 @@ Mon Jun 17 13:43:50 CEST 2013 - pth@suse.de
     user-defined suffix rules were present in a single Makefile.am,
     automake would needlessly include definition of some make variables
     related to C compilation in the generated Makefile.in (bug#14560).
+- Adapt automake-SuSE.patch to changed config.guess.
 
 -------------------------------------------------------------------
 Wed Jun 12 15:07:16 CEST 2013 - pth@suse.de

automake-testsuite.spec

@@ -44,6 +44,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
 Patch2:         automake-require_file.patch
+Patch3:         automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
 Patch100:       automake-SuSE.patch
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@ definitions (with rules occasionally thrown in).  The generated
 %prep
 %setup -q -n automake-%{version}
 %patch2
+%patch3 -p1
 %patch100
 
 %build

automake.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 16 21:10:46 UTC 2013 - andreas.stieger@gmx.de
+
+- fix tests on factory
+  automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
+
 -------------------------------------------------------------------
 Mon Jun 17 13:43:50 CEST 2013 - pth@suse.de
 

automake.spec

@@ -44,6 +44,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
 Patch2:         automake-require_file.patch
+Patch3:         automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
 Patch100:       automake-SuSE.patch
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@ definitions (with rules occasionally thrown in).  The generated
 %prep
 %setup -q -n automake-%{version}
 %patch2
+%patch3 -p1
 %patch100
 
 %build