From f9e1f1bc41f20919add4b9f6bdd11917f3dfb280 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Aug 2023 17:19:55 +0200 Subject: [PATCH] v1.10.1 --- .gitignore | 1 + libzip-tests.patch | 60 ---------------------------------------------- libzip.spec | 12 +++++----- sources | 2 +- 4 files changed, 8 insertions(+), 67 deletions(-) delete mode 100644 libzip-tests.patch diff --git a/.gitignore b/.gitignore index c6f30f6..5c644ed 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ libzip-0.9.3.tar.bz2 /libzip-1.9.1.tar.xz /libzip-1.9.2.tar.xz /libzip-1.10.0.tar.xz +/libzip-1.10.1.tar.xz diff --git a/libzip-tests.patch b/libzip-tests.patch deleted file mode 100644 index 228b51c..0000000 --- a/libzip-tests.patch +++ /dev/null @@ -1,60 +0,0 @@ -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 195f3ee..0a5e3d2 100644 --- a/libzip.spec +++ b/libzip.spec @@ -1,17 +1,14 @@ %bcond_without tests Name: libzip -Version: 1.10.0 -Release: 2%{?dist} +Version: 1.10.1 +Release: 1%{?dist} Summary: C library for reading, creating, and modifying zip archives 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 @@ -21,7 +18,7 @@ BuildRequires: libzstd-devel >= 1.3.6 BuildRequires: cmake >= 3.4 BuildRequires: mandoc %if %{with tests} -BuildRequires: python3-nihtest +BuildRequires: nihtest %endif @@ -119,6 +116,9 @@ sed -e '/clone-fs-/d' \ %changelog +* Wed Aug 23 2023 Remi Collet - 1.10.1-1 +- update to 1.10.1 + * Thu Jul 20 2023 Fedora Release Engineering - 1.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 0d733b9..8dbe068 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libzip-1.10.0.tar.xz) = 558dcb58f0c209fea22463fb2bb705e3e3f45066200c1f87f7c7139da10d14445e4d9ce208b7eedf5d46470f6c1120f77aa6c9619b221275e6f8f4facbebac0b +SHA512 (libzip-1.10.1.tar.xz) = d24670ca3fa5def0345d6c531045683f11a124af7975dd724eae3bf3128a62fb8185a3d4df029c7c8232c7584e5ac55d18c431dc53b91e992fbbc8d119442930