Hello community, here is the log from the commit of package automake for openSUSE:Factory checked in at 2016-07-09 09:19:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/automake (Old) and /work/SRC/openSUSE:Factory/.automake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "automake" Changes: -------- --- /work/SRC/openSUSE:Factory/automake/automake-testsuite.changes 2015-09-08 17:35:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.automake.new/automake-testsuite.changes 2016-07-09 09:19:58.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Jun 26 19:13:10 UTC 2016 - [email protected] + +- Fix tests with gzip-1.7 and later: + * automake-fix-tests-gzip.patch + +------------------------------------------------------------------- +Tue Jun 14 13:48:47 UTC 2016 - [email protected] + +- add 0001-correct-parameter-parsing-in-test-driver-script.patch + make parameter parsing of test driver script matching the help + text + +------------------------------------------------------------------- automake.changes: same change New: ---- 0001-correct-parameter-parsing-in-test-driver-script.patch automake-fix-tests-gzip.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ automake-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.7jCE5f/_old 2016-07-09 09:20:04.000000000 +0200 +++ /var/tmp/diff_new_pack.7jCE5f/_new 2016-07-09 09:20:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package automake-testsuite # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,9 @@ Patch2: automake-require_file.patch Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch Patch4: automake-perl-5.22.patch +Patch5: 0001-correct-parameter-parsing-in-test-driver-script.patch +# fixes failing tests with gzip-1.7 and later (upstream commit id 749468ac63042820bc3da85ece5bed64b0c15d62) +Patch6: automake-fix-tests-gzip.patch Patch100: automake-SuSE.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,6 +67,8 @@ %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %patch100 %build ++++++ automake.spec ++++++ --- /var/tmp/diff_new_pack.7jCE5f/_old 2016-07-09 09:20:04.000000000 +0200 +++ /var/tmp/diff_new_pack.7jCE5f/_new 2016-07-09 09:20:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package automake # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,9 @@ Patch2: automake-require_file.patch Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch Patch4: automake-perl-5.22.patch +Patch5: 0001-correct-parameter-parsing-in-test-driver-script.patch +# fixes failing tests with gzip-1.7 and later (upstream commit id 749468ac63042820bc3da85ece5bed64b0c15d62) +Patch6: automake-fix-tests-gzip.patch Patch100: automake-SuSE.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,6 +67,8 @@ %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %patch100 %build ++++++ 0001-correct-parameter-parsing-in-test-driver-script.patch ++++++ >From ba1172154da6739f9bf9e11c93f2abbb90a226ac Mon Sep 17 00:00:00 2001 From: Thomas Blume <[email protected]> Date: Tue, 14 Jun 2016 14:45:42 +0200 Subject: [PATCH] correct parameter parsing in test-driver script The help text suggest using an equal sign for assigning parameter values but the code only supports spaces. The patch adds support for both. --- lib/test-driver | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/lib/test-driver b/lib/test-driver index 8e575b0..69b47f8 100755 --- a/lib/test-driver +++ b/lib/test-driver @@ -56,21 +56,26 @@ trs_file= # Where to save the metadata of the test run. expect_failure=no color_tests=no enable_hard_errors=yes -while test $# -gt 0; do - case $1 in +while test $# -gt 1; do + arg=${1%=*} + val=${1#*=} + if [ $arg == $val ]; then + val=$2 + shift + fi + case $arg in --help) print_usage; exit $?;; --version) echo "test-driver $scriptversion"; exit $?;; - --test-name) test_name=$2; shift;; - --log-file) log_file=$2; shift;; - --trs-file) trs_file=$2; shift;; - --color-tests) color_tests=$2; shift;; - --expect-failure) expect_failure=$2; shift;; - --enable-hard-errors) enable_hard_errors=$2; shift;; - --) shift; break;; + --test-name) test_name=$val;; + --log-file) log_file=$val;; + --trs-file) trs_file=$val;; + --color-tests) color_tests=$val;; + --expect-failure) expect_failure=$val;; + --enable-hard-errors) enable_hard_errors=$val;; + --) break;; -*) usage_error "invalid option: '$1'";; - *) break;; esac - shift + [[ $arg != $val ]] && shift done missing_opts= -- 2.6.6 ++++++ automake-fix-tests-gzip.patch ++++++ >From 749468ac63042820bc3da85ece5bed64b0c15d62 Mon Sep 17 00:00:00 2001 From: Paul Eggert <eggert at> Date: Tue, 29 Mar 2016 02:44:19 +0000 Subject: automake: port better to future gzip * lib/am/distdir.am (dist-gzip, dist-shar, distcheck): Port better to future versions of gzip, which are planned to deprecate the GZIP environment variable (Bug#20132). --- diff --git a/lib/am/distdir.am b/lib/am/distdir.am index d4dd8cc..87c6730 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -309,6 +309,16 @@ endif %?TOPDIR_P% ## We order DIST_TARGETS by expected duration of the compressors, ## slowest first, for better parallelism in "make dist". Do not ## reorder DIST_ARCHIVES, users may expect gzip to be first. +## +## Traditionally, gzip prepended the contents of the GZIP environment +## variable to its arguments, and the commands below formerly used +## this by invoking 'GZIP=$(GZIP_ENV) gzip'. The GZIP environment +## variable is now considered to be obsolescent, so the commands below +## now use 'eval GZIP= gzip $(GZIP_ENV)' instead; this should work +## with both older and newer gzip implementations. The 'eval' is to +## support makefile assignments like 'GZIP_ENV = "-9 -n"' that quote +## the GZIP_ENV right-hand side because that was needed with the +## former invocation pattern. if %?TOPDIR_P% @@ -316,7 +326,7 @@ if %?TOPDIR_P% GZIP_ENV = --best .PHONY: dist-gzip dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2 @@ -352,7 +362,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) ?ZIP?DIST_ARCHIVES += $(distdir).zip @@ -412,7 +422,7 @@ endif %?SUBDIRS% distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -422,7 +432,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac -- cgit v0.9.0.2
