diff --git a/.gitignore b/.gitignore index f0552c7..275dc54 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/Imager-0.97.tar.gz -/Imager-0.98.tar.gz +/Imager-0.99.tar.gz diff --git a/Imager-0.98-RT-94717-libpng-1.6.10-no-longer-considers-CRC-error.patch b/Imager-0.98-RT-94717-libpng-1.6.10-no-longer-considers-CRC-error.patch deleted file mode 100644 index 25eb0be..0000000 --- a/Imager-0.98-RT-94717-libpng-1.6.10-no-longer-considers-CRC-error.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 1f8952f5facccefdd10e4ab1f13ce3abac183216 Mon Sep 17 00:00:00 2001 -From: Tony Cook -Date: Fri, 13 Jun 2014 20:51:05 +1000 -Subject: [PATCH] RT #94717 libpng 1.6.10 no longer considers CRC errors benign -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -use a different badness for checking benign error support - -Petr Pisar: Ported to 0.98. - -Signed-off-by: Petr Písař ---- - MANIFEST | 1 + - PNG/t/10png.t | 22 ++++++++++++++++++---- - PNG/testimg/bipalette.png | Bin 0 -> 129 bytes - 3 files changed, 19 insertions(+), 4 deletions(-) - create mode 100644 PNG/testimg/bipalette.png - -diff --git a/MANIFEST b/MANIFEST -index 2723a3b..7bb8921 100644 ---- a/MANIFEST -+++ b/MANIFEST -@@ -240,6 +240,7 @@ PNG/t/00load.t - PNG/t/10png.t Test png support - PNG/testimg/badcrc.png - PNG/testimg/bilevel.png -+PNG/testimg/bipalette.png bi-level but with a palette - PNG/testimg/comment.png - PNG/testimg/cover.png - PNG/testimg/cover16.png -diff --git a/PNG/t/10png.t b/PNG/t/10png.t -index bc109d7..b9365e4 100644 ---- a/PNG/t/10png.t -+++ b/PNG/t/10png.t -@@ -10,7 +10,7 @@ my $debug_writes = 1; - - init_log("testout/t102png.log",1); - --plan tests => 249; -+plan tests => 251; - - # this loads Imager::File::PNG too - ok($Imager::formats{"png"}, "must have png format"); -@@ -183,11 +183,25 @@ EOS - SKIP: - { # ignoring "benign" errors - $png_feat{"benign-errors"} -- or skip "libpng not configured for benign error support", 1; -+ or skip "libpng not configured for benign error support", 3; -+ -+ SKIP: -+ { -+ Imager::File::PNG::i_png_lib_version() < 10610 -+ or skip "1.6.10 and later treat CRC errors as non-benign", 1; -+ my $im = Imager->new; -+ ok($im->read(file => "testimg/badcrc.png", type => "png", -+ png_ignore_benign_errors => 1), -+ "read bad crc with png_ignore_benign_errors"); -+ } -+ - my $im = Imager->new; -- ok($im->read(file => "testimg/badcrc.png", type => "png", -+ ok($im->read(file => "testimg/bipalette.png", type => "png", - png_ignore_benign_errors => 1), -- "read bad crc with png_ignore_benign_errors"); -+ "read grey image with palette with png_ignore_benign_errors"); -+ ok(!$im->read(file => "testimg/bipalette.png", type => "png", -+ png_ignore_benign_errors => 0), -+ "read grey image with palette without png_ignore_benign_errors should fail"); - } - - { # write error reporting -diff --git a/PNG/testimg/bipalette.png b/PNG/testimg/bipalette.png -new file mode 100644 -index 0000000000000000000000000000000000000000..b105e44bb7ba2a61fa159b53b12751afa2b08803 -GIT binary patch -literal 129 -zcmeAS@N?(olHy`uVBq!ia0vp^Od!k%Bp9O38gv3Fg8-ipS0K&7!670dqNu27XlUr? -z=T}}{zF@(Ey?ghbJ9qBdwQKk8-FyE0`TO_pzkmP!|NsAeyACb|>f!NpaSY*@nOu;N -a!N9=i!f-G@-S7cWoWax8&t;ucLK6UHp)BbD - -literal 0 -HcmV?d00001 - --- -1.9.3 - diff --git a/perl-Imager.spec b/perl-Imager.spec index 2c38031..9daf1a8 100644 --- a/perl-Imager.spec +++ b/perl-Imager.spec @@ -1,16 +1,11 @@ Name: perl-Imager -Version: 0.98 -Release: 3%{?dist} +Version: 0.99 +Release: 1%{?dist} Summary: Perl extension for Generating 24 bit Images License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Imager/ Source0: http://www.cpan.org/authors/id/T/TO/TONYC/Imager-%{version}.tar.gz -# Adjusts tests to libpng-1.6.10, bug #1099392, CPAN RT#94717, in upstream -# after 0.98. -Patch0: Imager-0.98-RT-94717-libpng-1.6.10-no-longer-considers-CRC-error.patch -# For Imager-0.98-RT-94717-libpng-1.6.10-no-longer-considers-CRC-error.patch -BuildRequires: git BuildRequires: perl(Affix::Infix2Postfix) BuildRequires: perl(ExtUtils::MakeMaker) @@ -51,12 +46,6 @@ Summary: perl-Imager's Test module %prep %setup -q -n Imager-%{version} -git init-db . -git add . -git config user.email 'rpmbuild@localhost' -git config user.name 'rpmbuild' -git commit -m 'original' -git am < '%PATCH0' # fix permissions find \( -executable -a -type f \) -exec chmod -x {} \; @@ -80,7 +69,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; make test AUTOMATED_TESTING=1 %files -%defattr(-,root,root,-) %doc Changes README samples %{perl_vendorarch}/auto/* %exclude %{perl_vendorarch}/Imager/Test.pm @@ -94,6 +82,10 @@ make test AUTOMATED_TESTING=1 %{_mandir}/man3/Imager::Test.3pm* %changelog +* Sat Jun 28 2014 Ralf Corsépius - 0.99-1 +- Upstream update. +- Remove 2014-06-18's changes (went upstream). + * Wed Jun 18 2014 Petr Pisar - 0.98-3 - Adjusts tests to libpng-1.6.10 (bug #1099392) diff --git a/sources b/sources index 70f43e0..d784b82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62c6d7c3bd2ae48665b1d07d6a491397 Imager-0.98.tar.gz +b1cfceef55c94e6d42d4ac09c1314eff Imager-0.99.tar.gz