- rel 4; fc fix

diff --git a/autoconf-2.69-perl-5.22-autoscan.patch b/autoconf-2.69-perl-5.22-autoscan.patch
new file mode 100644 (file)
index 0000000..7442cad
--- /dev/null
+++ b/autoconf-2.69-perl-5.22-autoscan.patch
@@ -0,0 +1,28 @@
+From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Tue, 29 Jan 2013 13:46:48 -0800
+Subject: [PATCH] autoscan: port to perl 5.17
+
+* bin/autoscan.in (scan_sh_file): Escape '{'.  This avoids a
+feature that is deprecated in Perl 5.17.  Reported by Ray Lauff in
+<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>.
+---
+ bin/autoscan.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/autoscan.in b/bin/autoscan.in
+index 993a750..db1df79 100644
+--- a/bin/autoscan.in
++++ b/bin/autoscan.in
+@@ -358,7 +358,7 @@ sub scan_sh_file ($)
+     {
+       # Strip out comments and variable references.
+       s/#.*//;
+-      s/\${[^\}]*}//g;
++      s/\$\{[^\}]*}//g;
+       s/@[^@]*@//g;
+ 
+       # Tokens in the code.
+-- 
+2.1.0
+

diff --git a/autoconf.spec b/autoconf.spec
index bff6667db2fdbcf2b83906a376d4194c95dccaf5..13acb3c8a0a4fe7d8aa41e60821a41a3ba297a48 100644 (file)
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -21,7 +21,7 @@ Summary(ru.UTF-8):    GNU autoconf - автоконфигуратор исходн
 Summary(uk.UTF-8):     GNU autoconf - автоконфігуратор вихідних текстів
 Name:          autoconf
 Version:       2.69
-Release:       3
+Release:       4
 License:       GPL v2+/v3+
 Group:         Development/Building
 # stable releases:
@@ -34,6 +34,7 @@ Patch1:               %{name}-info.patch
 Patch2:                %{name}-AC_EGREP.patch
 Patch3:                %{name}-cxxcpp-warnonly.patch
 Patch4:                %{name}-mksh.patch
+Patch5:                autoconf-2.69-perl-5.22-autoscan.patch
 URL:           http://www.gnu.org/software/autoconf/
 %{?with_emacs:BuildRequires:   emacs}
 BuildRequires: xz
@@ -203,6 +204,7 @@ Tryb edycji autoconf dla emacsa.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p0
+%patch5 -p1
 
 %build
 %configure \