From c7a90ee9a01fe36b5bbe0d6aec6f1052611d4b33b5d780236f5b3d31acea7b9b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 26 Sep 2017 09:21:51 +0000 Subject: [PATCH] Accepting request 528506 from home:coolo:branches:openSUSE:Factory - add perl-526.patch to work with perl 5.26 OBS-URL: https://build.opensuse.org/request/show/528506 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=115 --- perl-526.patch | 22 ++++++++++++++++++++++ quilt.changes | 5 +++++ quilt.spec | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 perl-526.patch diff --git a/perl-526.patch b/perl-526.patch new file mode 100644 index 0000000..7ddd2b5 --- /dev/null +++ b/perl-526.patch @@ -0,0 +1,22 @@ +Index: quilt-0.65/test/run +=================================================================== +--- quilt-0.65.orig/test/run ++++ quilt-0.65/test/run +@@ -111,7 +111,7 @@ sub flush_output() + sub substitute_vars($) + { + my ($line) = @_; +- $line =~ s[%{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg; ++ $line =~ s[%\{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg; + return $line; + } + +@@ -287,7 +287,7 @@ while (defined(my $line = )) { + # Parse the next command + if ($line =~ s/^\s*\$ ?//) { + # Substitute %{?} with the last command's status +- $line =~ s[%{\?}][$last_status]eg; ++ $line =~ s[%\{\?}][$last_status]eg; + + chomp($prog = substitute_vars($line)); + $prog_line = $lineno; diff --git a/quilt.changes b/quilt.changes index 4c850bb..6d68c45 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 24 10:00:18 UTC 2017 - coolo@suse.com + +- add perl-526.patch to work with perl 5.26 + ------------------------------------------------------------------- Fri Jul 21 17:11:23 UTC 2017 - olaf@aepfle.de diff --git a/quilt.spec b/quilt.spec index 03d030d..4d790a5 100644 --- a/quilt.spec +++ b/quilt.spec @@ -44,6 +44,7 @@ Patch3: patch-wrapper-rpm.diff Patch4: suse-workaround-pseudo-release.patch Patch5: mail-fix-patch-set-threading.patch Patch6: quilt-translations.patch +Patch7: perl-526.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?suse_version} @@ -68,6 +69,7 @@ un-applied, refreshed, and more. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build # --with-rpmbuild=/usr/lib/rpm/rpmb: