Hello community, here is the log from the commit of package intltool for openSUSE:Factory checked in at 2015-09-08 17:35:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/intltool (Old) and /work/SRC/openSUSE:Factory/.intltool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "intltool" Changes: -------- --- /work/SRC/openSUSE:Factory/intltool/intltool.changes 2015-04-07 09:26:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.intltool.new/intltool.changes 2015-09-08 17:35:35.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 1 09:46:20 UTC 2015 - dims...@opensuse.org + +- Add intltool-perl-5.22.patch: Fix execution with perl 5.22. + +------------------------------------------------------------------- New: ---- intltool-perl-5.22.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ intltool.spec ++++++ --- /var/tmp/diff_new_pack.NQPmWX/_old 2015-09-08 17:35:36.000000000 +0200 +++ /var/tmp/diff_new_pack.NQPmWX/_new 2015-09-08 17:35:36.000000000 +0200 @@ -30,6 +30,8 @@ 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 dims...@opensuse.org -- Fix execution with perl 5.22 +Patch0: intltool-perl-5.22.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,6 +42,7 @@ %prep %setup -q +%patch0 -p0 %build %configure ++++++ intltool-perl-5.22.patch ++++++ --- 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?
