From 642a86545f34dc6a315fd56741068f2d3096af82 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Jul 2023 11:57:25 +0200 Subject: [PATCH] update to 1.10.0 use python3-nihtest instead of perl for tests --- .gitignore | 1 + libzip-tests.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++++ libzip.spec | 33 ++++++++++++------------- sources | 2 +- 4 files changed, 77 insertions(+), 19 deletions(-) create mode 100644 libzip-tests.patch diff --git a/.gitignore b/.gitignore index 8a674c6..c6f30f6 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ libzip-0.9.3.tar.bz2 /libzip-1.9.0.tar.xz /libzip-1.9.1.tar.xz /libzip-1.9.2.tar.xz +/libzip-1.10.0.tar.xz diff --git a/libzip-tests.patch b/libzip-tests.patch new file mode 100644 index 0000000..228b51c --- /dev/null +++ b/libzip-tests.patch @@ -0,0 +1,60 @@ +From cabb10e1519fb0379472c12ec77b09b00a1f13ec Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Sun, 25 Jun 2023 23:34:17 +0200 +Subject: [PATCH] Work around Linux's non-POSIX behaviour in getopt(3). + +Closes #386. +--- + regress/cancel_45.test | 2 +- + regress/cancel_90.test | 2 +- + regress/cm-default.test | 2 +- + regress/progress.test | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/regress/cancel_45.test b/regress/cancel_45.test +index c6989b58..591c4105 100644 +--- a/regress/cancel_45.test ++++ b/regress/cancel_45.test +@@ -1,6 +1,6 @@ + # test default compression stores if smaller; test cancel after 45% + return 1 +-arguments -n test.zip cancel 45 add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 ++arguments -n -- test.zip cancel 45 add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 + file large-uncompressible large-uncompressible + stdout + 0.0% done +diff --git a/regress/cancel_90.test b/regress/cancel_90.test +index da68ae77..ac34af73 100644 +--- a/regress/cancel_90.test ++++ b/regress/cancel_90.test +@@ -1,6 +1,6 @@ + # test default compression stores if smaller; test cancel after 90% + return 1 +-arguments -n test.zip cancel 90 add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 ++arguments -n -- test.zip cancel 90 add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 + file large-uncompressible large-uncompressible + stdout + 0.0% done +diff --git a/regress/cm-default.test b/regress/cm-default.test +index 0d3665f7..d7baa6e0 100644 +--- a/regress/cm-default.test ++++ b/regress/cm-default.test +@@ -1,5 +1,5 @@ + # test default compression stores if smaller + return 0 +-arguments -n test.zip add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 ++arguments -n -- test.zip add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 + file test.zip {} cm-default.zip + file large-uncompressible large-uncompressible +diff --git a/regress/progress.test b/regress/progress.test +index a8ebefe7..e5c26003 100644 +--- a/regress/progress.test ++++ b/regress/progress.test +@@ -1,6 +1,6 @@ + # test default compression stores if smaller; print progress + return 0 +-arguments -n test.zip print_progress add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 ++arguments -n -- test.zip print_progress add compressible aaaaaaaaaaaaaa add uncompressible uncompressible add_nul large-compressible 8200 add_file large-uncompressible large-uncompressible 0 -1 + file test.zip {} cm-default.zip + file large-uncompressible large-uncompressible + stdout diff --git a/libzip.spec b/libzip.spec index 71d420b..7593c3a 100644 --- a/libzip.spec +++ b/libzip.spec @@ -1,35 +1,28 @@ %bcond_without tests Name: libzip -Version: 1.9.2 -Release: 3%{?dist} +Version: 1.10.0 +Release: 1%{?dist} Summary: C library for reading, creating, and modifying zip archives -License: BSD +License: BSD-3-Clause URL: https://libzip.org/ Source0: https://libzip.org/download/libzip-%{version}.tar.xz +# Upstream patch +Patch0: libzip-tests.patch + BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: openssl-devel BuildRequires: xz-devel BuildRequires: libzstd-devel >= 1.3.6 -BuildRequires: cmake >= 3.0.2 -# Needed to run the test suite -# find regress/ -type f | /usr/lib/rpm/perl.req -# find regress/ -type f | /usr/lib/rpm/perl.prov -BuildRequires: perl-interpreter -BuildRequires: perl(Cwd) -BuildRequires: perl(File::Copy) -BuildRequires: perl(File::Path) -BuildRequires: perl(Getopt::Long) -BuildRequires: perl(IPC::Open3) -BuildRequires: perl(Storable) -BuildRequires: perl(Symbol) -BuildRequires: perl(UNIVERSAL) -BuildRequires: perl(strict) -BuildRequires: perl(warnings) +BuildRequires: cmake >= 3.4 +BuildRequires: mandoc +%if %{with tests} +BuildRequires: python3-nihtest +%endif %description @@ -126,6 +119,10 @@ sed -e '/clone-fs-/d' \ %changelog +* Mon Jul 10 2023 Remi Collet - 1.10.0-1 +- update to 1.10.0 +- use python3-nihtest instead of perl for tests + * Thu Jan 19 2023 Fedora Release Engineering - 1.9.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 6d47bf0..0d733b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libzip-1.9.2.tar.xz) = 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5 +SHA512 (libzip-1.10.0.tar.xz) = 558dcb58f0c209fea22463fb2bb705e3e3f45066200c1f87f7c7139da10d14445e4d9ce208b7eedf5d46470f6c1120f77aa6c9619b221275e6f8f4facbebac0b