diff --git a/13.patch b/13.patch deleted file mode 100644 index a68230e..0000000 --- a/13.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f45d9fd5dd56139698e34bcd82fdd329f77a67ab Mon Sep 17 00:00:00 2001 -From: Tony Cook -Date: Mon, 13 Feb 2023 14:16:49 +1100 -Subject: [PATCH] t/: use the the "isnt" form rather than "isn't" due to - deprecated ' - -Perl 5.38 (and current blead perl) deprecate use of ' to replace -:: in symbol names. - -This will produce an error from perl 5.40. ---- - t/parent-classfromclassfile.t | 2 +- - t/parent-classfromfile.t | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/t/parent-classfromclassfile.t b/t/parent-classfromclassfile.t -index 6d92e2d..0aa7e54 100755 ---- a/t/parent-classfromclassfile.t -+++ b/t/parent-classfromclassfile.t -@@ -18,4 +18,4 @@ use_ok('parent'); - # and does not get treated as a file: - eval q{package Test1; require Dummy; use parent -norequire, 'Dummy::InlineChild'; }; - is $@, '', "Loading an unadorned class works"; --isn't $INC{"Dummy.pm"}, undef, 'We loaded Dummy.pm'; -+isnt $INC{"Dummy.pm"}, undef, 'We loaded Dummy.pm'; -diff --git a/t/parent-classfromfile.t b/t/parent-classfromfile.t -index 13dbcc1..7afabe9 100755 ---- a/t/parent-classfromfile.t -+++ b/t/parent-classfromfile.t -@@ -20,6 +20,6 @@ my $base = './t'; - # and does not get treated as a file: - eval sprintf q{package Test2; require '%s/lib/Dummy2.plugin'; use parent -norequire, 'Dummy2::InlineChild' }, $base; - is $@, '', "Loading a class from a file works"; --isn't $INC{"$base/lib/Dummy2.plugin"}, undef, "We loaded the plugin file"; -+isnt $INC{"$base/lib/Dummy2.plugin"}, undef, "We loaded the plugin file"; - my $o = bless {}, 'Test2'; - isa_ok $o, 'Dummy2::InlineChild'; diff --git a/perl-parent.spec b/perl-parent.spec index 6e2a599..bde43fa 100644 --- a/perl-parent.spec +++ b/perl-parent.spec @@ -1,12 +1,11 @@ Name: perl-parent Epoch: 1 -Version: 0.240 +Version: 0.241 Release: 1%{?dist} Summary: Establish an ISA relationship with base classes at compile time License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/parent Source0: https://cpan.metacpan.org/authors/id/C/CO/CORION/parent-%{version}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/Corion/parent/pull/13.patch BuildArch: noarch # Module Build BuildRequires: coreutils @@ -38,10 +37,6 @@ from those modules at the same time. Mostly similar in effect to: %prep %setup -q -n parent-%{version} -# Actually include the patch that should have been in 0.240 -# https://github.com/Corion/parent/pull/13 -%patch0 -p1 - %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -60,6 +55,10 @@ make test %{_mandir}/man3/parent.3* %changelog +* Wed Feb 15 2023 Paul Howarth - 1:0.241-1 +- Update to 0.241 + - Actually include the changes documented for version 0.240 + * Tue Feb 14 2023 Paul Howarth - 1:0.240-1 - Update to 0.240 - Use Test::More::isnt() instead of Test::More::isn't in tests, which is diff --git a/sources b/sources index 6d43a6b..0d0ff98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (parent-0.240.tar.gz) = d0f8702efacbbda99f645c17bd67b52b4f39c1a3b5c3fb0b8a21ebf0a754735e34f9b33d27b4a2617f8da6af37df382226147793bac9a0f438039ca28f81661b +SHA512 (parent-0.241.tar.gz) = 33918aa4f6c7d988a5fd4abdda03aaf8734cfc3f0fbbaed45dd4f8a0c1913965da9d45257d0603ded4b2bdfb8cbcc409e02ac6097f5ab2b9b08fbf81eaaa4358