rpms/intltool
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix intltool-update to work with perl 5.26

Browse Source 
Patch taken from Debian's intltool_0.51.0-4.debian.tar.xz

https://bugzilla.redhat.com/show_bug.cgi?id=1462217
This commit is contained in:
Kalev Lember 2017-08-08 13:02:51 +02:00
parent c9d01655e9
commit f38d92c429
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
intltool-0.51.0-perl-5.22.patch → intltool-perl5.26-regex-fixes.patch
View File

@ -1,7 +1,15 @@
diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in Description: Escape "{", to prevent complaints from perl 5.22 and 5.26
--- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 Author: Roderich Schupp <roderich.schupp@gmail.com>
+++ intltool-0.51.0/intltool-update.in 2015-06-19 01:52:07.171228154 +0200 Author: gregor herrmann <gregoa@debian.org>
@@ -1062,7 +1062,7 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826471
Bug-Upstream: https://bugs.launchpad.net/intltool/+bug/1490906
Index: intltool-0.51.0/intltool-update.in
===================================================================
--- intltool-0.51.0.orig/intltool-update.in 2017-07-23 17:24:35.113169465 +0200
+++ intltool-0.51.0/intltool-update.in 2017-07-23 17:24:35.109169052 +0200
@@ -1062,13 +1062,13 @@
} }
} }
@ -10,6 +18,13 @@ diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-upda
{ {
my $rest = $3; my $rest = $3;
my $untouched = $1; my $untouched = $1;
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 @@ @@ -1190,10 +1190,10 @@
$name =~ s/\(+$//g; $name =~ s/\(+$//g;
$version =~ s/\(+$//g; $version =~ s/\(+$//g;

9
intltool.spec
View File

@ -1,7 +1,7 @@
Name: intltool Name: intltool
Summary: Utility for internationalizing various kinds of data files Summary: Utility for internationalizing various kinds of data files
Version: 0.51.0 Version: 0.51.0
Release: 9%{?dist} Release: 10%{?dist}
License: GPLv2 with exceptions License: GPLv2 with exceptions
Group: Development/Tools Group: Development/Tools
#VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk
@ -23,7 +23,9 @@ BuildRequires: gettext
# Martin Pitt: As the reporter of the bug I close this, as the new API du jour is gsettings, # 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. # which has a sensible gettext integration.
#Patch0: schemas-merge.patch #Patch0: schemas-merge.patch
Patch1: intltool-0.51.0-perl-5.22.patch # Fix intltool-update to work with perl 5.26. Patch taken from
# Debian's intltool_0.51.0-4.debian.tar.xz
Patch1: intltool-perl5.26-regex-fixes.patch
# https://bugs.launchpad.net/intltool/+bug/1505260 # https://bugs.launchpad.net/intltool/+bug/1505260
# https://bugzilla.redhat.com/show_bug.cgi?id=1249051 # https://bugzilla.redhat.com/show_bug.cgi?id=1249051
Patch2: intltool-merge-Create-cache-file-atomically.patch Patch2: intltool-merge-Create-cache-file-atomically.patch
@ -67,6 +69,9 @@ fi
%{_mandir}/man8/intltool*.8* %{_mandir}/man8/intltool*.8*
%changelog %changelog
* Tue Aug 08 2017 Kalev Lember <klember@redhat.com> - 0.51.0-10
- Fix intltool-update to work with perl 5.26 (#1462217)
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.51.0-9 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.51.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild