From 2bc6fab23881279728c9d5c93c3ee5ab72fcf31b Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Jul 07 2015 10:10:15 +0000
Subject: automake: escape '{' in regexp pattern


Resolves: rhbz#1239379
Version: 1.15-4

---

diff --git a/automake-1.15-perl-escape-curly-bracket.patch b/automake-1.15-perl-escape-curly-bracket.patch
new file mode 100644
index 0000000..7c22c4e
--- /dev/null
+++ b/automake-1.15-perl-escape-curly-bracket.patch
@@ -0,0 +1,21 @@
+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.spec b/automake.spec
index 5dfdd47..fafe441 100644
--- a/automake.spec
+++ b/automake.spec
@@ -18,6 +18,7 @@ Source3:    http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 
 # Keep those patches in 'git format-patch' format (with docs).
 Patch0:     automake-1.15-disable-vala-tests.patch
+Patch1:     automake-1.15-perl-escape-curly-bracket.patch
 
 URL:        http://www.gnu.org/software/automake/
 Requires:   autoconf >= 2.65
@@ -116,6 +117,7 @@ fi
 %changelog
 * Tue Jul 07 2015 Pavel Raiskup <praiskup@redhat.com> - 1.15-4
 - use %%autosetup macro
+- fix FTBFS with new Perl (rhbz#1239379)
 
 * Tue Jun 23 2015 Pavel Raiskup <praiskup@redhat.com> - 1.15-3
 - add perl-Thread-Queue BR to avoid FTBFS