From 47f0897d53dd546cb6c32ea10d1c46d14e3eaced Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Aug 15 2017 05:45:39 +0000 Subject: rebase to recent 1.15.1 bugfix release Resolves: rhbz#1463020 Version: 1.15.1-1 --- diff --git a/.gitignore b/.gitignore index 805ac77..aada0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/automake-1.15.tar.xz +/automake-1.15.1.tar.xz diff --git a/automake-1.15-avoid-dist-GZIP-var.patch b/automake-1.15-avoid-dist-GZIP-var.patch deleted file mode 100644 index a19bcfe..0000000 --- a/automake-1.15-avoid-dist-GZIP-var.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 749468ac63042820bc3da85ece5bed64b0c15d62 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 28 Mar 2016 19:44:19 -0700 -Subject: [PATCH] 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). ---- - lib/am/distdir.am | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -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 --- -2.7.4 - diff --git a/automake-1.15-perl-escape-curly-bracket.patch b/automake-1.15-perl-escape-curly-bracket.patch deleted file mode 100644 index 7c22c4e..0000000 --- a/automake-1.15-perl-escape-curly-bracket.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Pavel Raiskup -Date: Tue, 7 Jul 2015 10:54:24 +0200 -Subject: [PATCH 2/2] bin/automake: escape '{' in regexp pattern - -Resolves: rhbz#1239379 -Upstream report: -http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 - -diff --git a/bin/automake.in b/bin/automake.in -index eedc8bc..a679d16 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker - sub substitute_ac_subst_variables - { - my ($text) = @_; -- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; -+ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; - return $text; - } - diff --git a/automake.spec b/automake.spec index da3e3f6..9391c78 100644 --- a/automake.spec +++ b/automake.spec @@ -8,8 +8,8 @@ Summary: A GNU tool for automatically creating Makefiles Name: automake -Version: %{api_version} -Release: 11%{?dist} +Version: %{api_version}.1 +Release: 1%{?dist} # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT License: GPLv2+ and GFDL and Public Domain and MIT @@ -26,8 +26,6 @@ Source3: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess Patch0: automake-1.15-disable-vala-tests.patch Patch1: automake-1.15-dejagnu-testcase.patch %endif -Patch2: automake-1.15-perl-escape-curly-bracket.patch -Patch3: automake-1.15-avoid-dist-GZIP-var.patch URL: http://www.gnu.org/software/automake/ Requires: autoconf >= 2.65 @@ -124,6 +122,9 @@ fi %{_mandir}/man1/* %changelog +* Tue Aug 15 2017 Pavel Raiskup - 1.15.1-1 +- new upstream bug-fix release + * Wed Jul 26 2017 Fedora Release Engineering - 1.15-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index c30493d..4e5347d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a1ddb0e053474d9d1105cfe39b0c48d automake-1.15.tar.xz +SHA512 (automake-1.15.1.tar.xz) = 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688