From 63dc80c54744d1b7de54493dc61a49324db91f3766fcdfefda6f37fdfbea2621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 17 Aug 2013 11:53:41 +0000 Subject: [PATCH] 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 --- ...-primary-prefix-invalid-couples-test.patch | 26 +++++++++++++++++++ automake-testsuite.changes | 7 +++++ automake-testsuite.spec | 2 ++ automake.changes | 6 +++++ automake.spec | 2 ++ 5 files changed, 43 insertions(+) create mode 100644 automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch diff --git a/automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch b/automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch new file mode 100644 index 0000000..7c1a1d1 --- /dev/null +++ b/automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch @@ -0,0 +1,26 @@ +From: Andreas Stieger +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 + diff --git a/automake-testsuite.changes b/automake-testsuite.changes index 39387c4..8f2c938 100644 --- a/automake-testsuite.changes +++ b/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 diff --git a/automake-testsuite.spec b/automake-testsuite.spec index edf610b..dce3edb 100644 --- a/automake-testsuite.spec +++ b/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 diff --git a/automake.changes b/automake.changes index 3842679..8f2c938 100644 --- a/automake.changes +++ b/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 diff --git a/automake.spec b/automake.spec index 9a61af0..c756ecd 100644 --- a/automake.spec +++ b/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