diff options
| author | Jan Palus | 2017-06-12 18:24:30 (GMT) |
|---|---|---|
| committer | Jan Palus | 2017-06-12 18:24:30 (GMT) |
| commit | 25427f6d9e1b02b005c2d6463a792244222d683b (patch) | |
| tree | 46453a5c02cc881f205346de7035b80893d6af2c | |
| parent | 9b8586b3b328906f62248c0f2d696ab9ef3f3626 (diff) | |
| download | intltool-25427f6d9e1b02b005c2d6463a792244222d683b.zip intltool-25427f6d9e1b02b005c2d6463a792244222d683b.tar.gz | |
new patch to correct regex in intltool-update; rel 2auto/th/intltool-0.51.0-2
from https://bugs.launchpad.net/intltool/+bug/1490906
| -rw-r--r-- | intltool-perl-5.22.patch | 43 | ||||
| -rw-r--r-- | intltool.spec | 4 |
2 files changed, 46 insertions, 1 deletions
diff --git a/intltool-perl-5.22.patch b/intltool-perl-5.22.patch new file mode 100644 index 0000000..41a2571 --- /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.spec b/intltool.spec index e1c115b..8f136c9 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,11 +3,12 @@ Summary: Utility scripts for internationalizing various kinds of data files Summary(pl.UTF-8): Skrypty do internacjonalizacji różnych typów plików z danymi Name: intltool Version: 0.51.0 -Release: 1 +Release: 2 License: GPL v2 Group: Development/Tools Source0: https://launchpad.net/intltool/trunk/%{version}/+download/%{name}-%{version}.tar.gz # Source0-md5: 12e517cac2b57a0121cda351570f1e63 +Patch0: %{name}-perl-5.22.patch URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -41,6 +42,7 @@ rozszerzony o inne rodzaje plików. %prep %setup -q +%patch0 %build %{__aclocal} |