diff --git a/intltool-perl-5.22.patch b/intltool-perl-5.22.patch index d957da6..089eeeb 100644 --- a/intltool-perl-5.22.patch +++ b/intltool-perl-5.22.patch @@ -1,6 +1,8 @@ ---- 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 @@ +Index: intltool-update.in +=================================================================== +--- intltool-update.in.orig ++++ intltool-update.in +@@ -1062,13 +1062,13 @@ sub SubstituteVariable } } @@ -9,7 +11,14 @@ { my $rest = $3; 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; $version =~ s/\(+$//g; @@ -24,7 +33,7 @@ } if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) -@@ -1219,11 +1219,11 @@ +@@ -1219,11 +1219,11 @@ sub FindPackageName $version =~ s/\(+$//g; $bugurl =~ s/\(+$//g if (defined $bugurl); diff --git a/intltool.changes b/intltool.changes index f92d35a..169666f 100644 --- a/intltool.changes +++ b/intltool.changes @@ -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 diff --git a/intltool.spec b/intltool.spec index 010292f..1baf747 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed