pool/intltool
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 528643 from GNOME:Factory

Browse Source 
- extend intltool-perl-5.22.patch to fix one more perl 5.26 issue (forwarded request 528478 from coolo)

OBS-URL: https://build.opensuse.org/request/show/528643
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/intltool?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2017-10-02 14:44:14 +00:00 committed by Git OBS Bridge
commit 0a2def4a28
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
intltool-perl-5.22.patch
View File

@ -1,6 +1,8 @@
--- intltool-update.in 2015-03-09 02:39:54.000000000 +0100 Index: intltool-update.in
+++ intltool-update.in 2015-09-01 11:43:40.595517191 +0200 ===================================================================
@@ -1062,7 +1062,7 @@ --- intltool-update.in.orig
+++ intltool-update.in
@@ -1062,13 +1062,13 @@ sub SubstituteVariable
} }
} }
@ -9,7 +11,14 @@
{ {
my $rest = $3; my $rest = $3;
my $untouched = $1; my $untouched = $1;
@@ -1190,10 +1190,10 @@ my $sub = "";
# Ignore recursive definitions of variables
- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
+ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
return SubstituteVariable ("$untouched$sub$rest");
}
@@ -1190,10 +1190,10 @@ sub FindPackageName
$name =~ s/\(+$//g; $name =~ s/\(+$//g;
$version =~ s/\(+$//g; $version =~ s/\(+$//g;
@ -24,7 +33,7 @@
} }
if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
@@ -1219,11 +1219,11 @@ @@ -1219,11 +1219,11 @@ sub FindPackageName
$version =~ s/\(+$//g; $version =~ s/\(+$//g;
$bugurl =~ s/\(+$//g if (defined $bugurl); $bugurl =~ s/\(+$//g if (defined $bugurl);

5
intltool.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Sep 24 07:18:06 UTC 2017 - coolo@suse.com
- extend intltool-perl-5.22.patch to fix one more perl 5.26 issue
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 2 15:22:35 UTC 2017 - bwiedemann@suse.com Tue May 2 15:22:35 UTC 2017 - bwiedemann@suse.com

2
intltool.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package intltool # spec file for package intltool
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed