From 151857f77eadb7294d82729af3aa15b9123b5718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Mon, 13 Jul 2015 17:05:03 +0200 Subject: [PATCH] Add intltool-0.51.0-perl-5.22.patch (Address RHBZ#1233444) - Remove unnecessary %debug_package. --- intltool-0.51.0-perl-5.22.patch | 44 +++++++++++++++++++++++++++++++++ intltool.spec | 11 ++++++--- 2 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 intltool-0.51.0-perl-5.22.patch diff --git a/intltool-0.51.0-perl-5.22.patch b/intltool-0.51.0-perl-5.22.patch new file mode 100644 index 0000000..be672d0 --- /dev/null +++ b/intltool-0.51.0-perl-5.22.patch @@ -0,0 +1,44 @@ +diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in +--- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 ++++ intltool-0.51.0/intltool-update.in 2015-06-19 01:52:07.171228154 +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.spec b/intltool.spec index b29d32d..f989993 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,10 +1,7 @@ -# debuginfo not needed -%define debug_package %{nil} - Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -23,6 +20,7 @@ BuildRequires: gettext # Martin Pitt: As the reporter of the bug I close this, as the new API du jour is gsettings, # which has a sensible gettext integration. #Patch0: schemas-merge.patch +Patch1: intltool-0.51.0-perl-5.22.patch %description This tool automatically extracts translatable strings from oaf, glade, @@ -31,6 +29,7 @@ them in the po files. %prep %setup -q +%patch1 -p1 %build %configure @@ -52,6 +51,10 @@ make check %{_mandir}/man8/intltool*.8* %changelog +* Mon Jul 13 2015 Ralf Corsépius - 0.51.0-3 +- Add intltool-0.51.0-perl-5.22.patch (Address RHBZ#1233444) +- Remove unnecessary %%debug_package. + * Wed Jun 17 2015 Fedora Release Engineering - 0.51.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild