diff --git a/IO-Compress-2.070-Adapt-tests-to-zlib-1.2.11.patch b/IO-Compress-2.070-Adapt-tests-to-zlib-1.2.11.patch deleted file mode 100644 index 91a35c8..0000000 --- a/IO-Compress-2.070-Adapt-tests-to-zlib-1.2.11.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a30130055928e5979c35aceee75cc3becfe3ad22 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 7 Feb 2017 17:23:29 +0100 -Subject: [PATCH] Adapt tests to zlib 1.2.11 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -CPAN RT#120134 - -Signed-off-by: Petr Písař ---- - t/cz-03zlib-v1.t | 13 +++++++++++-- - t/cz-06gzsetp.t | 4 +++- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/t/cz-03zlib-v1.t b/t/cz-03zlib-v1.t -index a85ed10..e070d46 100755 ---- a/t/cz-03zlib-v1.t -+++ b/t/cz-03zlib-v1.t -@@ -23,10 +23,10 @@ BEGIN - - my $count = 0 ; - if ($] < 5.005) { -- $count = 453 ; -+ $count = 456 ; - } - else { -- $count = 471 ; -+ $count = 474 ; - } - - -@@ -721,6 +721,9 @@ EOM - - ($Answer, $status) = $x->deflate($hello) ; - ok $status == Z_OK ; -+ ($X, $status) = $x->flush(Z_BLOCK) ; -+ ok $status == Z_OK ; -+ $Answer .= $X ; - $input .= $hello; - - # error cases -@@ -747,6 +750,9 @@ EOM - ($X, $status) = $x->deflate($goodbye) ; - ok $status == Z_OK ; - $Answer .= $X ; -+ ($X, $status) = $x->flush(Z_BLOCK) ; -+ ok $status == Z_OK ; -+ $Answer .= $X ; - $input .= $goodbye; - - # change only Level -@@ -759,6 +765,9 @@ EOM - ($X, $status) = $x->deflate($goodbye) ; - ok $status == Z_OK ; - $Answer .= $X ; -+ ($X, $status) = $x->flush(Z_BLOCK) ; -+ ok $status == Z_OK ; -+ $Answer .= $X ; - $input .= $goodbye; - - # change only Strategy -diff --git a/t/cz-06gzsetp.t b/t/cz-06gzsetp.t -index b2cc687..45869a0 100644 ---- a/t/cz-06gzsetp.t -+++ b/t/cz-06gzsetp.t -@@ -39,7 +39,7 @@ my $ver = Compress::Zlib::zlib_version(); - plan skip_all => "gzsetparams needs zlib 1.0.6 or better. You have $ver\n" - if ZLIB_VERNUM() < 0x1060 ; - --plan tests => 51 + $extra ; -+plan tests => 55 + $extra ; - - # Check zlib_version and ZLIB_VERSION are the same. - SKIP: { -@@ -65,6 +65,7 @@ SKIP: { - - $input .= $hello; - is $x->gzwrite($hello), $len_hello, "gzwrite returned $len_hello" ; -+ cmp_ok $x->gzflush(Z_BLOCK), '==', Z_OK, "flush before gzsetparams is ok"; - - # Error cases - eval { $x->gzsetparams() }; -@@ -120,6 +121,7 @@ foreach my $CompressClass ('IO::Compress::Gzip', - - my $input .= $hello; - is $x->write($hello), $len_hello, "wrote $len_hello bytes" ; -+ ok $x->flush(Z_BLOCK), "flush before deflateParams is ok"; - - # Change both Level & Strategy - ok $x->deflateParams(Z_BEST_SPEED, Z_HUFFMAN_ONLY), "deflateParams ok"; --- -2.7.4 - diff --git a/perl-IO-Compress.spec b/perl-IO-Compress.spec index 86716c6..50db130 100644 --- a/perl-IO-Compress.spec +++ b/perl-IO-Compress.spec @@ -2,16 +2,13 @@ %{?perl_default_filter} Name: perl-IO-Compress -Version: 2.070 -Release: 2%{?dist} +Version: 2.072 +Release: 1%{?dist} Summary: Read and write compressed data License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-Compress/ Source0: http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/IO-Compress-%{version}.tar.gz -# Adjust tests to zlib-1.2.11, bug #1420012, CPAN RT#120134, can be removed -# after fixing perl-Compress-Raw-Zlib properly (CPAN RT#119762) -Patch0: IO-Compress-2.070-Adapt-tests-to-zlib-1.2.11.patch BuildArch: noarch # Module Build BuildRequires: coreutils @@ -84,7 +81,6 @@ included with the IO-Compress distribution: %prep %setup -q -n IO-Compress-%{version} -%patch0 -p1 # Remove spurious exec permissions chmod -c -x lib/IO/Uncompress/{Adapter/Identity,RawInflate}.pm @@ -135,6 +131,9 @@ make test COMPRESS_ZLIB_RUN_%{?with_long_tests:ALL}%{!?with_long_tests:MOST}=1 %{_mandir}/man3/IO::Uncompress::*.3* %changelog +* Mon Feb 13 2017 Jitka Plesnikova - 2.072-1 +- 2.072 bump + * Fri Feb 10 2017 Petr Pisar - 2.070-2 - Adjust tests to zlib-1.2.11 (bug #1420012) diff --git a/sources b/sources index be19d7f..05718df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (IO-Compress-2.070.tar.gz) = f0c269174ac4708d2a2434ad9ad29d3f35e967b3084caba102b66352ce978ba27c4579a7e69bddbe3ed41853f6db2c1ca53880ce313995ad813ac6b96dd67748 +SHA512 (IO-Compress-2.072.tar.gz) = 23987ad3d32f26f7e0d33aa81b566a0d615706eb5e2ee454a1589d8f6f409d4faa9a791420191ad7de6cc97cf1e0e92a346a840a3f3ab83f45860a1980c72906