From cccc588f4695a1aee3322fec90cd59917ec55a15 Mon Sep 17 00:00:00 2001 From: gengqihu <2712504175@qq.com> Date: Fri, 24 May 2024 11:22:24 +0800 Subject: [PATCH] Fix test case failure caused by zlib (cherry picked from commit 05ad180243d6ff0535c5a200be61454e38d0d3f6) --- Fix-test-case-failure-caused-by-zlib.patch | 48 ++++++++++++++++++++++ perl-Compress-Raw-Zlib.spec | 7 +++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 Fix-test-case-failure-caused-by-zlib.patch diff --git a/Fix-test-case-failure-caused-by-zlib.patch b/Fix-test-case-failure-caused-by-zlib.patch new file mode 100644 index 0000000..019d10d --- /dev/null +++ b/Fix-test-case-failure-caused-by-zlib.patch @@ -0,0 +1,48 @@ +From 2b0aa66459bd10a10ecbe25ab4e7ec8de073aebf Mon Sep 17 00:00:00 2001 +From: gengqihu +Date: Fri, 24 May 2024 09:37:44 +0800 +Subject: [PATCH] Fix test case failure caused by zlib + +--- + t/02zlib.t | 18 ++---------------- + 1 file changed, 2 insertion(+), 16deletions(-) + +diff --git a/t/02zlib.t b/t/02zlib.t +index 292538b..f52d170 100644 +--- a/t/02zlib.t ++++ b/t/02zlib.t +@@ -489,14 +489,7 @@ SKIP: + + # Z_STREAM_END returned by 1.12.2, Z_DATA_ERROR for older zlib + # ZLIB_NG has the fix for all versions +- if (ZLIB_VERNUM >= ZLIB_1_2_12_0 || Compress::Raw::Zlib::is_zlibng) +- { +- cmp_ok $status, '==', Z_STREAM_END ; +- } +- else +- { +- cmp_ok $status, '==', Z_DATA_ERROR ; +- } ++ cmp_ok $status, '==', Z_STREAM_END ; + + is $GOT, $goodbye ; + +@@ -523,14 +516,7 @@ SKIP: + $GOT = ''; + $status = $k->inflate($rest, $GOT); + # Z_STREAM_END returned by 1.12.2, Z_DATA_ERROR for older zlib +- if (ZLIB_VERNUM >= ZLIB_1_2_12_0 || Compress::Raw::Zlib::is_zlibng) +- { +- cmp_ok $status, '==', Z_STREAM_END ; +- } +- else +- { +- cmp_ok $status, '==', Z_DATA_ERROR ; +- } ++ cmp_ok $status, '==', Z_STREAM_END ; + + is $GOT, $goodbye ; + } +-- +2.33.0 + diff --git a/perl-Compress-Raw-Zlib.spec b/perl-Compress-Raw-Zlib.spec index 3c8e4f3..b13a98f 100644 --- a/perl-Compress-Raw-Zlib.spec +++ b/perl-Compress-Raw-Zlib.spec @@ -1,7 +1,7 @@ Name: perl-Compress-Raw-Zlib Epoch: 1 Version: 2.202 -Release: 1 +Release: 2 Summary: Provides a Perl interface to the zlib compression library # source code in tarball have different license # not used @@ -11,6 +11,8 @@ License: GPL-1.0-or-later and zlib URL: https://metacpan.org/release/Compress-Raw-Zlib Source0: https://cpan.metacpan.org/authors/id/P/PM/PMQS/Compress-Raw-Zlib-%{version}.tar.gz +Patch0: Fix-test-case-failure-caused-by-zlib.patch + BuildRequires: gcc perl(ExtUtils::MakeMaker) perl-interpreter perl-generators zlib-devel #for test BuildRequires: perl(Test::Pod) >= 1.00 perl-devel @@ -51,6 +53,9 @@ make test TEST_VERBOSE=1 COMPRESS_ZLIB_RUN_ALL=1 %{_mandir}/man3/* %changelog +* Fri May 24 2024 gengqihu - 1:2.202-2 +- Fix test case failure caused by zlib + * Tue Oct 18 2022 renhongxun - 1:2.202-1 - upgrade version to 2.202 -- Gitee