- updated to 1.15.1 (improved perl and gzip compatibility)

- updated morearchs patch
- removed obsolete perl-escape-curly-bracket patch

diff --git a/automake-1.15-perl-escape-curly-bracket.patch b/automake-1.15-perl-escape-curly-bracket.patch
deleted file mode 100644 (file)
index 7c22c4e..0000000
--- a/automake-1.15-perl-escape-curly-bracket.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Pavel Raiskup <praiskup@redhat.com>
-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-morearchs.patch b/automake-morearchs.patch
index 691c148bdeb222f3864293c4790bf5c1ebf15328..6d1c1d5b072f68d033c4a43d31536b7ed2423760 100644 (file)
--- a/automake-morearchs.patch
+++ b/automake-morearchs.patch
@@ -1,8 +1,8 @@
---- automake-1.9.6/lib/config.sub~     2005-07-10 17:16:04.000000000 +0000
-+++ automake-1.9.6/lib/config.sub      2006-02-12 14:02:11.000000000 +0000
-@@ -836,6 +836,12 @@
-               ;;
-       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+--- automake-1.15.1/lib/config.sub.orig        2017-06-20 16:43:35.596510193 +0200
++++ automake-1.15.1/lib/config.sub     2017-06-20 17:09:44.756492278 +0200
+@@ -1037,6 +1037,12 @@
+       ppc-* | ppcbe-*)
+               basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
 +      ppc74[05]0)
 +              basic_machine=powerpc-unknown
@@ -10,6 +10,6 @@
 +      ppc74[05]0-*)
 +              basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
-       ppcle | powerpclittle | ppc-le | powerpc-little)
+       ppcle | powerpclittle)
                basic_machine=powerpcle-unknown
                ;;

diff --git a/automake.spec b/automake.spec
index 93dfdb4769446f52ba0d3bf8871d0ed636e247b0..de8c887166c1842d788de7fdf1c8bac00173e963 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -14,19 +14,18 @@ Summary(ru.UTF-8):  GNU automake - инструменты для автомати
 Summary(tr.UTF-8):     Makefile yapılandırma araçları
 Summary(uk.UTF-8):     GNU automake - інструменти для автоматичної генерації Makefile'ів
 Name:          automake
-Version:       1.15
-Release:       4
+Version:       1.15.1
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Building
 Source0:       http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
-# Source0-md5: 9a1ddb0e053474d9d1105cfe39b0c48d
+# Source0-md5: 24cd3501b6ad8cd4d7e2546f07e8b4d4
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-man.patch
 Patch2:                %{name}-no_versioned_dir.patch
 Patch3:                %{name}-morearchs.patch
-Patch4:                automake-1.15-perl-escape-curly-bracket.patch
-Patch5:                revert-debian-python-hacks.patch
+Patch4:                revert-debian-python-hacks.patch
 URL:           http://sources.redhat.com/automake/
 BuildRequires: autoconf >= 2.69
 %if %{without bootstrap}
@@ -110,7 +109,6 @@ Makefile'ів.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %if %{without bootstrap}
 # prepare temporary copy of m4 dir without amversion.m4 (which causes automake version check)