From 065019e59211fdaf57180c18fc3d47b3b53975b8dfe183087772a43d51caeb73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Tue, 1 Sep 2015 10:10:55 +0000
Subject: [PATCH] Accepting request 328287 from
 home:dimstar:branches:GNOME:Apps

- Add intltool-perl-5.22.patch: Fix execution with perl 5.22.

OBS-URL: https://build.opensuse.org/request/show/328287
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/intltool?expand=0&rev=31
---
 intltool-perl-5.22.patch | 43 ++++++++++++++++++++++++++++++++++++++++
 intltool.changes         |  5 +++++
 intltool.spec            |  3 +++
 3 files changed, 51 insertions(+)
 create mode 100644 intltool-perl-5.22.patch

diff --git a/intltool-perl-5.22.patch b/intltool-perl-5.22.patch
new file mode 100644
index 0000000..d957da6
--- /dev/null
+++ b/intltool-perl-5.22.patch
@@ -0,0 +1,43 @@
+--- intltool-update.in	2015-03-09 02:39:54.000000000 +0100
++++ intltool-update.in	2015-09-01 11:43:40.595517191 +0200
+@@ -1062,7 +1062,7 @@
+ 	}
+     }
+ 
+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+ 	my $rest = $3;
+ 	my $untouched = $1;
+@@ -1190,10 +1190,10 @@
+ 	$name    =~ s/\(+$//g;
+ 	$version =~ s/\(+$//g;
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
++	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+     }
+ 
+     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+@@ -1219,11 +1219,11 @@
+ 	$version =~ s/\(+$//g;
+         $bugurl  =~ s/\(+$//g if (defined $bugurl);
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
++	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
++        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
+     }
+ 
+     # \s makes this not work, why?
diff --git a/intltool.changes b/intltool.changes
index ba493ab..a760fda 100644
--- a/intltool.changes
+++ b/intltool.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  1 09:46:20 UTC 2015 - dimstar@opensuse.org
+
+- Add intltool-perl-5.22.patch: Fix execution with perl 5.22.
+
 -------------------------------------------------------------------
 Wed Mar 25 22:28:10 UTC 2015 - zaitor@opensuse.org
 
diff --git a/intltool.spec b/intltool.spec
index 0d59847..cfb3ec8 100644
--- a/intltool.spec
+++ b/intltool.spec
@@ -30,6 +30,8 @@ Provides:       xml-i18n-tools
 Obsoletes:      xml-i18n-tools
 Url:            https://edge.launchpad.net/intltool/
 Source:         https://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM intltool-perl-5.22.patch lp#1490906 dimstar@opensuse.org -- Fix execution with perl 5.22
+Patch0:         intltool-perl-5.22.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -40,6 +42,7 @@ information is written back into the XML files.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure