Accepting request 328329 from home:dimstar:Factory

Also fix automake with perl 5.22

OBS-URL: https://build.opensuse.org/request/show/328329
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=50

automake-perl-5.22.patch

@@ -0,0 +1,13 @@
+Index: automake-1.15/bin/automake.in
+===================================================================
+--- automake-1.15.orig/bin/automake.in
++++ automake-1.15/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;
+ }
+ 

automake-testsuite.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep  1 12:12:46 UTC 2015 - dimstar@opensuse.org
+
+- Add automake-perl-5.22.patch: Fix test suite with perl 5.22 by
+  silencing some warnings.
+
 -------------------------------------------------------------------
 Sun May 17 13:18:57 UTC 2015 - meissner@suse.com
 

automake-testsuite.spec

@@ -33,6 +33,7 @@ Source2:        http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig
 Source3:        automake-rpmlintrc
 Patch2:         automake-require_file.patch
 Patch3:         automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
+Patch4:         automake-perl-5.22.patch
 Patch100:       automake-SuSE.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -62,6 +63,7 @@ definitions (with rules occasionally thrown in).  The generated
 %setup -q -n automake-%{version}
 %patch2
 %patch3 -p1
+%patch4 -p1
 %patch100
 
 %build

automake.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep  1 12:12:46 UTC 2015 - dimstar@opensuse.org
+
+- Add automake-perl-5.22.patch: Fix test suite with perl 5.22 by
+  silencing some warnings.
+
 -------------------------------------------------------------------
 Sun May 17 13:18:57 UTC 2015 - meissner@suse.com
 

automake.spec

@@ -33,6 +33,7 @@ Source2:        http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig
 Source3:        automake-rpmlintrc
 Patch2:         automake-require_file.patch
 Patch3:         automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
+Patch4:         automake-perl-5.22.patch
 Patch100:       automake-SuSE.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -62,6 +63,7 @@ definitions (with rules occasionally thrown in).  The generated
 %setup -q -n automake-%{version}
 %patch2
 %patch3 -p1
+%patch4 -p1
 %patch100
 
 %build