Accepting request 528751 from devel:tools:scm

1

OBS-URL: https://build.opensuse.org/request/show/528751
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quilt?expand=0&rev=69

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 = <SOURCE>)) {
+ 	# 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;

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
 

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: