diff --git a/parent-0.225-Perl-5.18.0-has-changed-error-message.patch b/parent-0.225-Perl-5.18.0-has-changed-error-message.patch deleted file mode 100644 index 348d98a..0000000 --- a/parent-0.225-Perl-5.18.0-has-changed-error-message.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a8d39e4eb350fb1a30fcbdbb3f8f110fe2a708fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 12 Jul 2013 14:32:28 +0200 -Subject: [PATCH] Perl 5.18.0 has changed error message -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - - -Signed-off-by: Petr Písař ---- - t/parent.t | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/t/parent.t b/t/parent.t -index 401fe39..f3b8533 100755 ---- a/t/parent.t -+++ b/t/parent.t -@@ -58,10 +58,18 @@ is( $Eval2::VERSION, '1.02' ); - - - eval q{use parent 'reallyReAlLyNotexists'}; --like( $@, q{/^Can't locate reallyReAlLyNotexists.pm in \@INC \(\@INC contains:/}, 'baseclass that does not exist'); -+like( $@, -+ ($] < 5.018) ? -+ q{/^Can't locate reallyReAlLyNotexists.pm in \@INC \(\@INC contains:/} : -+ q{/^Can't locate reallyReAlLyNotexists.pm in \@INC \(you may need to install the reallyReAlLyNotexists module\) \(\@INC contains:/}, -+ 'baseclass that does not exist'); - - eval q{use parent 'reallyReAlLyNotexists'}; --like( $@, q{/^Can't locate reallyReAlLyNotexists.pm in \@INC \(\@INC contains:/}, ' still failing on 2nd load'); -+like( $@, -+ ($] < 5.018) ? -+ q{/^Can't locate reallyReAlLyNotexists.pm in \@INC \(\@INC contains:/} : -+ q{/^Can't locate reallyReAlLyNotexists.pm in \@INC \(you may need to install the reallyReAlLyNotexists module\) \(\@INC contains:/}, -+ ' still failing on 2nd load'); - { - my $warning; - local $SIG{__WARN__} = sub { $warning = shift }; --- -1.8.1.4 - diff --git a/perl-parent.spec b/perl-parent.spec index 5cd37db..fdaae10 100644 --- a/perl-parent.spec +++ b/perl-parent.spec @@ -1,14 +1,12 @@ Name: perl-parent Epoch: 1 -Version: 0.225 -Release: 290%{?dist} +Version: 0.226 +Release: 1%{?dist} Summary: Establish an ISA relationship with base classes at compile time License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/parent/ Source0: http://search.cpan.org/CPAN/authors/id/C/CO/CORION/parent-%{version}.tar.gz -# Adjust tests to perl-5.18, CPAN RT#86890 -Patch0: parent-0.225-Perl-5.18.0-has-changed-error-message.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) @@ -31,7 +29,6 @@ from those modules at the same time. Mostly similar in effect to: %prep %setup -q -n parent-%{version} -%patch0 -p1 # Remove spurious exec permissions chmod -c -x Changes lib/parent.pm @@ -58,6 +55,10 @@ rm -rf %{buildroot} %{_mandir}/man3/parent.3pm* %changelog +* Mon Jul 29 2013 Paul Howarth - 1:0.226-1 +- Update to 0.226 + - Fix tests for Perl 5.18 (CPAN RT#86890) + * Mon Jul 15 2013 Petr Pisar - 1:0.225-290 - Increase release to favour standalone package @@ -78,7 +79,7 @@ rm -rf %{buildroot} - Specify all dependencies * Mon Aug 13 2012 Marcela Mašláňová - 1:0.225-240 -- bump release to override sub-package from perl.spec +- Bump release to override sub-package from perl.spec * Fri Jul 20 2012 Fedora Release Engineering - 1:0.225-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 82811d2..e6a1ffc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd8a62a28b3fa1c6d43973a9cb6b7796 parent-0.225.tar.gz +a73841127da29dcdf8e71f8afa09542e parent-0.226.tar.gz