autoscan: escape '{' in regexp (FTBFS)

Also switch from %setup to %autosetup.  While we are on it, the
BuildArch statement must be called after Patch* declarations
(otherwise the rhbz#1084309 will bite us).

Related: rhbz#1239378
Version: 2.69-21

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
+

autoconf.spec

@@ -1,14 +1,18 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
 Version:    2.69
-Release:    20%{?dist}
+Release:    21%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source0:    http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz
 Source1:    config.site
 Source2:    autoconf-init.el
 URL:        http://www.gnu.org/software/autoconf/
-BuildArch: noarch
+
+Patch1:     autoconf-2.69-perl-5.22-autoscan.patch
+
+BuildArch:  noarch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # run "make check" by default
@@ -62,7 +66,7 @@ Autoconf is only required for the generation of the scripts, not
 their use.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure --with-lispdir=%{_emacs_sitelispdir}/autoconf
@@ -105,6 +109,9 @@ fi
 %doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Mon Jul 06 2015 Pavel Raiskup <praiskup@redhat.com> - 2.69-21
+- '{' character in regular expression must be escaped with perl 5.22
+
 * Fri Jun 26 2015 Pavel Raiskup <praiskup@redhat.com> - 2.69-20
 - conform to Packaging:Emacs guidelines (#1204274), init script
   by Jonathan Underwood