diff --git a/Filter-Simple-0.94-Upgrade-to-0.96.patch b/Filter-Simple-0.94-Upgrade-to-0.96.patch new file mode 100644 index 0000000..0c5f8b8 --- /dev/null +++ b/Filter-Simple-0.94-Upgrade-to-0.96.patch @@ -0,0 +1,87 @@ +From 4ba21b30b81c9f775932674d4c29f1b81e15bfa2 Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Tue, 21 Apr 2020 09:01:47 +0200 +Subject: [PATCH] Upgrade to 0.96 + +--- + lib/Filter/Simple.pm | 3 ++- + t/filter_only.t | 19 ++++++++++++++++++- + t/lib/Filter/Simple/ExeNoComments.pm | 11 +++++++++++ + 3 files changed, 31 insertions(+), 2 deletions(-) + create mode 100644 t/lib/Filter/Simple/ExeNoComments.pm + +diff --git a/lib/Filter/Simple.pm b/lib/Filter/Simple.pm +index 1dcf3c8..924c2ae 100644 +--- a/lib/Filter/Simple.pm ++++ b/lib/Filter/Simple.pm +@@ -2,7 +2,7 @@ package Filter::Simple; + + use Text::Balanced ':ALL'; + +-our $VERSION = '0.95'; ++our $VERSION = '0.96'; + + use Filter::Util::Call; + use Carp; +@@ -70,6 +70,7 @@ my %extractor_for = ( + my %selector_for = ( + all => sub { my ($t)=@_; sub{ $_=$$_; $t->(@_); $_} }, + executable=> sub { my ($t)=@_; sub{ref() ? $_=$$_ : $t->(@_); $_} }, ++ executable_no_comments=> sub { my ($t)=@_; sub{ref() ? $_=$$_ : $t->(@_); $_} }, + quotelike => sub { my ($t)=@_; sub{ref() && do{$_=$$_; $t->(@_)}; $_} }, + regex => sub { my ($t)=@_; + sub{ref() or return $_; +diff --git a/t/filter_only.t b/t/filter_only.t +index 57f1086..cd86707 100644 +--- a/t/filter_only.t ++++ b/t/filter_only.t +@@ -4,7 +4,7 @@ BEGIN { + + use Filter::Simple::FilterOnlyTest qr/not ok/ => "ok", + "bad" => "ok", fail => "die"; +-print "1..9\n"; ++print "1..11\n"; + + sub fail { print "ok ", $_[0], "\n" } + sub ok { print "ok ", $_[0], "\n" } +@@ -41,3 +41,20 @@ print "ok 8\n"; + + print "not " unless "bad" =~ /bad/; + print "ok 9\n"; ++ ++use Filter::Simple::ExeNoComments; ++ ++=for us ++ ++shromplex ++ ++=cut ++ ++# shromplex ++ ++# test the difference from code* ++my $x = "ABC"; ++ ++print $x eq "TEST" ? "" : "not ", "ok 10 # check strings processed\n"; ++ ++print "ok 11 # executable_no_comments\n"; +diff --git a/t/lib/Filter/Simple/ExeNoComments.pm b/t/lib/Filter/Simple/ExeNoComments.pm +new file mode 100644 +index 0000000..3eaa454 +--- /dev/null ++++ b/t/lib/Filter/Simple/ExeNoComments.pm +@@ -0,0 +1,11 @@ ++package Filter::Simple::ExeNoComments; ++ ++use Filter::Simple; ++ ++FILTER_ONLY ++ executable_no_comments => sub { ++ $_ =~ /shromplex/ and die "We wants no shromplexes!"; ++ s/ABC/TEST/g; ++ }; ++ ++1; +-- +2.21.1 + diff --git a/perl-Filter-Simple.spec b/perl-Filter-Simple.spec index f6e89fb..9db249c 100644 --- a/perl-Filter-Simple.spec +++ b/perl-Filter-Simple.spec @@ -1,7 +1,7 @@ %global base_version 0.94 Name: perl-Filter-Simple -Version: 0.95 -Release: 440%{?dist} +Version: 0.96 +Release: 456%{?dist} Summary: Simplified Perl source filtering License: GPL+ or Artistic URL: https://metacpan.org/release/Filter-Simple @@ -9,6 +9,8 @@ Source0: https://cpan.metacpan.org/authors/id/S/SM/SMUELLER/Filter-Simple BuildArch: noarch # Unbundled from perl 5.28.0-RC1 Patch0: Filter-Simple-0.94-Upgrade-to-0.95.patch +# Unbundled from perl 5.32.0 +Patch1: Filter-Simple-0.94-Upgrade-to-0.96.patch BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter @@ -37,6 +39,7 @@ Filter::Util::Call; one that is sufficient for most common cases. %prep %setup -q -n Filter-Simple-%{base_version} %patch0 -p1 +%patch1 -p1 %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 @@ -55,6 +58,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Jun 22 2020 Jitka Plesnikova - 0.96-456 +- Upgrade to 0.96 as provided in perl-5.32.0 + * Thu Jan 30 2020 Fedora Release Engineering - 0.95-440 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild