diff --git a/.gitignore b/.gitignore index a2807ca..c902303 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/Filter-Simple-0.94.tar.gz +Filter-Simple-0.94.tar.gz diff --git a/.perl-Filter-Simple.metadata b/.perl-Filter-Simple.metadata deleted file mode 100644 index 753dc4e..0000000 --- a/.perl-Filter-Simple.metadata +++ /dev/null @@ -1 +0,0 @@ -3a014fa2187ff4ec5cc626126dfb0cea92b0fbb2 SOURCES/Filter-Simple-0.94.tar.gz diff --git a/SOURCES/Filter-Simple-0.94-Upgrade-to-0.95.patch b/Filter-Simple-0.94-Upgrade-to-0.95.patch similarity index 100% rename from SOURCES/Filter-Simple-0.94-Upgrade-to-0.95.patch rename to Filter-Simple-0.94-Upgrade-to-0.95.patch 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/SPECS/perl-Filter-Simple.spec b/SPECS/perl-Filter-Simple.spec deleted file mode 100644 index e84ab18..0000000 --- a/SPECS/perl-Filter-Simple.spec +++ /dev/null @@ -1,116 +0,0 @@ -%global base_version 0.94 -Name: perl-Filter-Simple -Version: 0.95 -Release: 439%{?dist} -Summary: Simplified Perl source filtering -License: GPL+ or Artistic -URL: https://metacpan.org/release/Filter-Simple -Source0: https://cpan.metacpan.org/authors/id/S/SM/SMUELLER/Filter-Simple-%{base_version}.tar.gz -BuildArch: noarch -# Unbundled from perl 5.28.0-RC1 -Patch0: Filter-Simple-0.94-Upgrade-to-0.95.patch -BuildRequires: make -BuildRequires: perl-generators -BuildRequires: perl-interpreter -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 -BuildRequires: perl(strict) -# Run-time: -BuildRequires: perl(Carp) -BuildRequires: perl(Filter::Util::Call) -BuildRequires: perl(Text::Balanced) >= 1.97 -BuildRequires: perl(vars) -BuildRequires: perl(warnings) -# Tests: -BuildRequires: perl(Exporter) -BuildRequires: perl(parent) -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) -Requires: perl(Text::Balanced) >= 1.97 -Requires: perl(warnings) - -# Filter under-specified dependencies -%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Text::Balanced\\)$ - -%description -The Filter::Simple Perl module provides a simplified interface to -Filter::Util::Call; one that is sufficient for most common cases. - -%prep -%setup -q -n Filter-Simple-%{base_version} -%patch0 -p1 - -%build -perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 -make %{?_smp_mflags} - -%install -make pure_install DESTDIR=$RPM_BUILD_ROOT -%{_fixperms} $RPM_BUILD_ROOT/* - -%check -make test - -%files -%doc Changes README -%{perl_vendorlib}/* -%{_mandir}/man3/* - -%changelog -* Fri Jul 26 2019 Fedora Release Engineering - 0.95-439 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 30 2019 Jitka Plesnikova - 0.95-438 -- Increase release to favour standalone package - -* Fri Feb 01 2019 Fedora Release Engineering - 0.95-418 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.95-417 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jun 27 2018 Jitka Plesnikova - 0.95-416 -- Increase release to favour standalone package - -* Thu May 24 2018 Jitka Plesnikova - 0.95-1 -- Upgrade to 0.95 as provided in perl-5.28.0-RC1 - -* Thu Feb 08 2018 Fedora Release Engineering - 0.94-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 10 2017 Petr Pisar - 0.94-1 -- 0.94 bump - -* Thu Jul 27 2017 Fedora Release Engineering - 0.93-394 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Jun 03 2017 Jitka Plesnikova - 0.93-393 -- Perl 5.26 rebuild - -* Thu May 11 2017 Petr Pisar - 0.93-1 -- Upgrade to 0.93 as provided in perl-5.25.12 - -* Sat Feb 11 2017 Fedora Release Engineering - 0.92-366 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat May 14 2016 Jitka Plesnikova - 0.92-365 -- Increase release to favour standalone package - -* Thu Feb 04 2016 Fedora Release Engineering - 0.92-347 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 0.92-346 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Jun 04 2015 Jitka Plesnikova - 0.92-345 -- Increase release to favour standalone package - -* Wed Jun 03 2015 Jitka Plesnikova - 0.92-2 -- Perl 5.22 rebuild - -* Wed May 06 2015 Petr Pisar - 0.92-1 -- 0.92 bump in order to dual-live with perl 5.22 - -* Tue Nov 18 2014 Petr Pisar - 0.91-340 -- Increase release number to supersede perl's sub-package - -* Wed Oct 29 2014 Petr Pisar 0.91-240 -- Specfile autogenerated by cpanspec 1.78. diff --git a/perl-Filter-Simple.spec b/perl-Filter-Simple.spec new file mode 100644 index 0000000..a994686 --- /dev/null +++ b/perl-Filter-Simple.spec @@ -0,0 +1,205 @@ +%global base_version 0.94 +Name: perl-Filter-Simple +Version: 0.96 +Release: 511%{?dist} +Summary: Simplified Perl source filtering +License: GPL-1.0-or-later OR Artistic-1.0-Perl +URL: https://metacpan.org/release/Filter-Simple +Source0: https://cpan.metacpan.org/authors/id/S/SM/SMUELLER/Filter-Simple-%{base_version}.tar.gz +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: coreutils +BuildRequires: make +BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 +BuildRequires: perl(strict) +# Run-time: +BuildRequires: perl(Carp) +BuildRequires: perl(Filter::Util::Call) +BuildRequires: perl(Text::Balanced) >= 1.97 +BuildRequires: perl(vars) +BuildRequires: perl(warnings) +# Tests: +BuildRequires: perl(Exporter) +BuildRequires: perl(parent) +Requires: perl(Text::Balanced) >= 1.97 +Requires: perl(warnings) + +# Filter under-specified dependencies +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Text::Balanced\\)$ +# Filter modules bundled for tests +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir} +%global __requires_exclude %{__requires_exclude}|^perl\\(Filter::Simple::.*\\) + +%description +The Filter::Simple Perl module provides a simplified interface to +Filter::Util::Call; one that is sufficient for most common cases. + +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-Test-Harness + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + +%prep +%setup -q -n Filter-Simple-%{base_version} +%patch -P0 -p1 +%patch -P1 -p1 + +# Help generators to recognize Perl scripts +for F in t/*.t; do + perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F" + chmod +x "$F" +done + +%build +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} + +%install +%{make_install} +%{_fixperms} %{buildroot}/* + +# Install tests +mkdir -p %{buildroot}%{_libexecdir}/%{name} +cp -a t %{buildroot}%{_libexecdir}/%{name} +cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF' +#!/bin/sh +cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)" +EOF +chmod +x %{buildroot}%{_libexecdir}/%{name}/test + +%check +export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}') +make test + +%files +%doc Changes README +%{perl_vendorlib}/Filter* +%{_mandir}/man3/Filter::Simple* + +%files tests +%{_libexecdir}/%{name} + +%changelog +* Tue Oct 29 2024 Troy Dawson - 0.96-511 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Thu Jul 18 2024 Jitka Plesnikova - 0.96-510 +- Increase release to favour standalone package + +* Mon Jun 24 2024 Troy Dawson - 0.96-504 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.96-503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.96-502 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Sep 14 2023 Jitka Plesnikova - 0.96-501 +- Package tests + +* Thu Jul 20 2023 Fedora Release Engineering - 0.96-500 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jitka Plesnikova - 0.96-499 +- Increase release to favour standalone package + +* Fri Jan 20 2023 Fedora Release Engineering - 0.96-490 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.96-489 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 30 2022 Jitka Plesnikova - 0.96-488 +- Increase release to favour standalone package + +* Fri Jan 21 2022 Fedora Release Engineering - 0.96-479 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.96-478 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 0.96-477 +- Increase release to favour standalone package + +* Wed Jan 27 2021 Fedora Release Engineering - 0.96-458 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.96-457 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* 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 + +* Fri Jul 26 2019 Fedora Release Engineering - 0.95-439 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 30 2019 Jitka Plesnikova - 0.95-438 +- Increase release to favour standalone package + +* Fri Feb 01 2019 Fedora Release Engineering - 0.95-418 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.95-417 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jun 27 2018 Jitka Plesnikova - 0.95-416 +- Increase release to favour standalone package + +* Thu May 24 2018 Jitka Plesnikova - 0.95-1 +- Upgrade to 0.95 as provided in perl-5.28.0-RC1 + +* Thu Feb 08 2018 Fedora Release Engineering - 0.94-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 10 2017 Petr Pisar - 0.94-1 +- 0.94 bump + +* Thu Jul 27 2017 Fedora Release Engineering - 0.93-394 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Jun 03 2017 Jitka Plesnikova - 0.93-393 +- Perl 5.26 rebuild + +* Thu May 11 2017 Petr Pisar - 0.93-1 +- Upgrade to 0.93 as provided in perl-5.25.12 + +* Sat Feb 11 2017 Fedora Release Engineering - 0.92-366 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat May 14 2016 Jitka Plesnikova - 0.92-365 +- Increase release to favour standalone package + +* Thu Feb 04 2016 Fedora Release Engineering - 0.92-347 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 0.92-346 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Jun 04 2015 Jitka Plesnikova - 0.92-345 +- Increase release to favour standalone package + +* Wed Jun 03 2015 Jitka Plesnikova - 0.92-2 +- Perl 5.22 rebuild + +* Wed May 06 2015 Petr Pisar - 0.92-1 +- 0.92 bump in order to dual-live with perl 5.22 + +* Tue Nov 18 2014 Petr Pisar - 0.91-340 +- Increase release number to supersede perl's sub-package + +* Wed Oct 29 2014 Petr Pisar 0.91-240 +- Specfile autogenerated by cpanspec 1.78. diff --git a/sources b/sources new file mode 100644 index 0000000..460b186 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (Filter-Simple-0.94.tar.gz) = 489d13fed4f27055254c88e4ee929e1f766e3a17197c89c4267eaab3e07ab9a127e8e292267fb6a029f26878425eb756879555e0fe4d0ced02cb114830f392c8