ppisar pushed to perl-rpm-build-perl (master). "Make adjustments for perl-5.22 compatible with older perls"

[notifications at fedoraproject.org]

From 5332f5295ef4fb32af509147c1c0aecb3f5057cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Wed, 17 Jun 2015 07:07:28 +0200
Subject: Make adjustments for perl-5.22 compatible with older perls


diff --git a/perl-rpm-build-perl.spec b/perl-rpm-build-perl.spec
index ca15cd8..3f28064 100644
--- a/perl-rpm-build-perl.spec
+++ b/perl-rpm-build-perl.spec
@@ -1,6 +1,6 @@
 Name:       perl-rpm-build-perl 
 Version:    0.82
-Release:    10%{?dist}
+Release:    11%{?dist}
 # README: GPLv2+
 # perl.prov: LGPLv2+
 License:    GPLv2+
@@ -10,12 +10,11 @@ Url:        http://search.cpan.org/dist/rpm-build-perl
 Source:     http://search.cpan.org/CPAN/authors/id/A/AT/ATOURBIN/rpm-build-perl-%{version}.tar.gz 
 # Perl 5.18 compatibility, CPAN RT#85411
 Patch0:     rpm-build-perl-0.82-Fix-non-deterministic-failures-on-newer-perls.patch
-# Perl 5.22 compatibility, required perl >= 5.22, bug #1231258, CPAN RT#104885
+# Perl 5.22 compatibility, bug #1231258, CPAN RT#104885
 Patch1:     rpm-build-perl-0.82-Adjust-to-perl-5.22.patch
 BuildRequires:  findutils
 BuildRequires:  make
-# perl version constraint for rpm-build-perl-0.82-Adjust-to-perl-5.22.patch
-BuildRequires:  perl >= 4:5.22
+BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker) 
 BuildRequires:  perl(strict)
 # Run-time
@@ -87,6 +86,9 @@ make test
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Jun 17 2015 Petr Pisar <ppisar at redhat.com> - 0.82-11
+- Make adjustments for perl-5.22 compatible with older perls (bug #1231258)
+
 * Tue Jun 16 2015 Petr Pisar <ppisar at redhat.com> - 0.82-10
 - Adjust to perl-5.22 (bug #1231258)
 
diff --git a/rpm-build-perl-0.82-Adjust-to-perl-5.22.patch b/rpm-build-perl-0.82-Adjust-to-perl-5.22.patch
index 9331fb4..5bb3cec 100644
--- a/rpm-build-perl-0.82-Adjust-to-perl-5.22.patch
+++ b/rpm-build-perl-0.82-Adjust-to-perl-5.22.patch
@@ -1,4 +1,4 @@
-From fc37d660dd918997669ef2c24cf4098104c6eb89 Mon Sep 17 00:00:00 2001
+From 7d2911bc4694b272b1ed116bb7c87de644e8e1a0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
 Date: Tue, 16 Jun 2015 18:20:20 +0200
 Subject: [PATCH] Adjust to perl-5.22
@@ -23,18 +23,18 @@ Date: Sat Oct 18 10:23:26 2014 -0700
     Use srefgen for anoncode
 
 This patch implements the changes to make tests passing with perl
-5.22. It does not aim for backward compatibility.
+5.22 and previous versions too.
 
 CPAN RT#104885
 
 Signed-off-by: Petr Písař <ppisar at redhat.com>
 ---
- lib/B/PerlReq.pm | 14 ++++++++++----
+ lib/B/PerlReq.pm | 19 +++++++++++++++----
  lib/B/Walker.pm  |  9 ++++++++-
- 2 files changed, 18 insertions(+), 5 deletions(-)
+ 2 files changed, 23 insertions(+), 5 deletions(-)
 
 diff --git a/lib/B/PerlReq.pm b/lib/B/PerlReq.pm
-index 303454f..b852f83 100644
+index 303454f..4527b2b 100644
 --- a/lib/B/PerlReq.pm
 +++ b/lib/B/PerlReq.pm
 @@ -44,7 +44,7 @@ our @Skip = (
@@ -46,18 +46,23 @@ index 303454f..b852f83 100644
  
  sub RequiresPerl ($) {
  	my $v = shift;
-@@ -273,8 +273,8 @@ my %TryCV;
+@@ -273,8 +273,13 @@ my %TryCV;
  sub grok_try {
  	return unless $INC{"Try/Tiny.pm"};
  	my (undef, $op) = @_;
 -	return unless $op->name eq "refgen";
 -	$op = $op->first->first->sibling;
-+	return unless $op->name eq "srefgen";
-+	$op = $op->first->first;
++	if ($op->name eq "srefgen") {
++		$op = $op->first->first;
++	} elsif ($op->name eq "refgen") {
++		$op = $op->first->first->sibling;
++	} else {
++		return;
++	}
  	return unless $op->name eq "anoncode";
  	my $cv = padval($op->targ);
  	$TryCV{$$cv} = 1;
-@@ -304,7 +304,13 @@ sub grok_entersub ($) {
+@@ -304,7 +309,13 @@ sub grok_entersub ($) {
  		$op = $op->sibling;
  	}
  	if ($op->name eq "method_named") {
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-rpm-build-perl.git/commit/?h=master&id=5332f5295ef4fb32af509147c1c0aecb3f5057cc