rpm/intltool
SHA256
1
0
Fork 0
forked from pool/intltool
Code Pull Requests Activity

Accepting request 328287 from home:dimstar:branches:GNOME:Apps

Browse Source 
- 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
This commit is contained in:
Bjørn Lie 2015-09-01 10:10:55 +00:00 committed by Git OBS Bridge
parent faccf62fb1
commit 065019e592
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
intltool-perl-5.22.patch Normal file
View File

@ -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?

5
intltool.changes
View File

@ -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

3
intltool.spec
View File

@ -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