From 79fa9ca6a15ac7213e1cc446389e9af0a88e1bdf Mon Sep 17 00:00:00 2001
From: Paul Howarth <p...@city-fan.org>
Date: Wed, 21 Jun 2017 11:28:03 +0100
Subject: Update to 1.228
- New upstream release 1.228
- Fix test reliance on '.' in @INC
- Temporary fix to keep an untested combination from blocking Perl::Critic
- Keep PPI::Dumper from breaking Perl::Critic under cperl 5.27
- Fix upstream's temporary fix (GH#206, GH#212)
---
PPI-1.228-fix-temporary-fix.patch | 12 ++++++++++++
perl-PPI.spec | 21 +++++++++++++++++----
sources | 2 +-
3 files changed, 30 insertions(+), 5 deletions(-)
create mode 100644 PPI-1.228-fix-temporary-fix.patch
diff --git a/PPI-1.228-fix-temporary-fix.patch
b/PPI-1.228-fix-temporary-fix.patch
new file mode 100644
index 0000000..ce2c754
--- /dev/null
+++ b/PPI-1.228-fix-temporary-fix.patch
@@ -0,0 +1,12 @@
+--- lib/PPI/Tokenizer.pm
++++ lib/PPI/Tokenizer.pm
+@@ -833,8 +833,7 @@ sub __current_token_is_forced_word {
+ # We also have to make sure that the sub/package/etc doing the
forcing
+ # is not a method call.
+ if( $USUALLY_FORCES{$content}) {
+- return 1 if not defined $word; # TODO this is a quick
fix to unblock Perl::Critic users, needs to be verified
+- return if $word =~ /^v[0-9]+$/ and ( $content eq "use"
or $content eq "no" );
++ return if defined($word) and $word =~ /^v[0-9]+$/ and (
$content eq "use" or $content eq "no" );
+ return 1 if not $prevprev;
+ return 1 if not $USUALLY_FORCES{$prevprev->content} and
$prevprev->content ne '->';
+ return;
diff --git a/perl-PPI.spec b/perl-PPI.spec
index e371b00..1a79ec8 100644
--- a/perl-PPI.spec
+++ b/perl-PPI.spec
@@ -6,13 +6,14 @@
%endif
Name: perl-PPI
-Version: 1.224
-Release: 3%{?dist}
+Version: 1.228
+Release: 1%{?dist}
Summary: Parse, Analyze and Manipulate Perl
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/PPI/
Source0:
http://search.cpan.org/CPAN/authors/id/M/MI/MITHALDU/PPI-%{version}.tar.gz
Patch0: PPI-1.215-utf8.patch
+Patch1: PPI-1.228-fix-temporary-fix.patch
BuildArch: noarch
# =============== Module Build ======================
BuildRequires: coreutils
@@ -96,6 +97,11 @@ Parse, analyze and manipulate Perl (without perl).
# Recode documentation as UTF-8
%patch0
+# Fix upstream's temporary fix
+# https://github.com/adamkennedy/PPI/issues/206
+# https://github.com/adamkennedy/PPI/issues/212
+%patch1
+
%if %{without XSAccessor}
rm lib/PPI/XSAccessor.pm
sed -i '/^lib\/PPI\/XSAccessor\.pm$/d' MANIFEST
@@ -129,6 +135,13 @@ make test TEST_FILES="xt/*.t" RELEASE_TESTING=1
%{_mandir}/man3/PPI*.3*
%changelog
+* Wed Jun 21 2017 Paul Howarth <p...@city-fan.org> - 1.228-1
+- Update to 1.228
+ - Fix test reliance on '.' in @INC
+ - Temporary fix to keep an untested combination from blocking Perl::Critic
+ - Keep PPI::Dumper from breaking Perl::Critic under cperl 5.27
+- Fix upstream's temporary fix (GH#206, GH#212)
+
* Wed Jun 07 2017 Jitka Plesnikova <jples...@redhat.com> - 1.224-3
- Perl 5.26 re-rebuild of bootstrapped packages
@@ -291,8 +304,8 @@ make test TEST_FILES="xt/*.t" RELEASE_TESTING=1
- Fixed CPAN RT#44862: PPI cannot parse "package Foo::100;" correctly
- Fixed CPAN RT#54208: PPI::Token::Quote::Literal::literal missing
- run release tests as well as regular test suite
-- BR: perl(File::Find::Rule) >= 0.32, perl(File::Find::Rule::Perl) >= 1.09,
- perl(Perl::MinimumVersion) >= 1.24 and perl(Test::MinimumVersion) >=
0.101080
+- BR: perl(File::Find::Rule) >= 0.32, perl(File::Find::Rule::Perl) >= 1.09,
+ perl(Perl::MinimumVersion) >= 1.24 and perl(Test::MinimumVersion) >= 0.101080
for release tests
* Sat Jul 31 2010 Paul Howarth <p...@city-fan.org> - 1.210-1
diff --git a/sources b/sources
index 6897646..b02d018 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PPI-1.224.tar.gz) =
7c5f4a01b3d4a1e7e2f68d7e5c81368387fbe9a4cd2f20afc494706f742c9ba0b293747b692fb77af9a1457e077687c7d5217bf09137ab71bb50ba52da24431c
+SHA512 (PPI-1.228.tar.gz) =
3fa0aff7921b37f75de6f407d0b4c9b78e4e5670e3537e10b6b6934324deacdf5974bd15dffc8914999a9693bd28ffb24fb217f4f76d5343de26c0160da485fe
--
cgit v1.1
https://src.fedoraproject.org/cgit/perl-PPI.git/commit/?h=f26&id=79fa9ca6a15ac7213e1cc446389e9af0a88e1bdf
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
