From 34d2af7b9362ed60d5dd209489865cf0ad16b87b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 17:23:32 +0000 Subject: [PATCH] import UBI libzip-1.10.1-5.el10 --- .gitignore | 2 +- .libzip.metadata | 1 - SPECS/libzip.spec => libzip.spec | 141 +++++++++++++++++++++++++------ sources | 1 + 4 files changed, 116 insertions(+), 29 deletions(-) delete mode 100644 .libzip.metadata rename SPECS/libzip.spec => libzip.spec (68%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 96d5bfd..bf3ac0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libzip-1.6.1.tar.xz +libzip-1.10.1.tar.xz diff --git a/.libzip.metadata b/.libzip.metadata deleted file mode 100644 index 7ea7e9b..0000000 --- a/.libzip.metadata +++ /dev/null @@ -1 +0,0 @@ -a820f23509d20f242173d34978624191739f599b SOURCES/libzip-1.6.1.tar.xz diff --git a/SPECS/libzip.spec b/libzip.spec similarity index 68% rename from SPECS/libzip.spec rename to libzip.spec index cb9fa62..d5decc1 100644 --- a/SPECS/libzip.spec +++ b/libzip.spec @@ -1,11 +1,11 @@ -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests Name: libzip -Version: 1.6.1 -Release: 1%{?dist} +Version: 1.10.1 +Release: 5%{?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 @@ -14,21 +14,12 @@ BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: openssl-devel BuildRequires: xz-devel -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: libzstd-devel >= 1.3.6 +BuildRequires: cmake >= 3.4 +BuildRequires: mandoc +%if %{with tests} +BuildRequires: nihtest +%endif %description @@ -64,6 +55,10 @@ The %{name}-tools package provides command line tools split off %{name}: # unwanted in package documentation rm INSTALL.md +# drop skipped test which make test suite fails (cmake issue ?) +sed -e '/clone-fs-/d' \ + -i regress/CMakeLists.txt + %build %cmake \ @@ -74,22 +69,22 @@ rm INSTALL.md -DENABLE_WINDOWS_CRYPTO:BOOL=OFF \ -DENABLE_BZIP2:BOOL=ON \ -DENABLE_LZMA:BOOL=ON \ + -DENABLE_ZSTD:BOOL=ON \ -DBUILD_TOOLS:BOOL=ON \ -DBUILD_REGRESS:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=OFF \ - -DBUILD_DOC:BOOL=ON \ - . + -DBUILD_DOC:BOOL=ON -make %{?_smp_mflags} +%cmake_build %install -make install DESTDIR=%{buildroot} INSTALL='install -p' +%cmake_install %check -%if %{with_tests} -make check +%if %{with tests} +%ctest %else : Test suite disabled %endif @@ -114,21 +109,113 @@ make check %{_includedir}/zipconf*.h %{_libdir}/libzip.so %{_libdir}/pkgconfig/libzip.pc +%{_libdir}/cmake/libzip %{_mandir}/man3/libzip* %{_mandir}/man3/zip* %{_mandir}/man3/ZIP* %changelog -* Thu May 14 2020 Remi Collet - 1.6.1-1 +* Tue Oct 29 2024 Troy Dawson - 1.10.1-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.10.1-4 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.10.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* 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 + +* 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 + +* Thu Jul 21 2022 Fedora Release Engineering - 1.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 28 2022 Remi Collet - 1.9.2-1 +- update to 1.9.2 + +* Tue Jun 28 2022 Remi Collet - 1.9.1-1 +- update to 1.9.1 + +* Tue Jun 14 2022 Remi Collet - 1.9.0-1 +- update to 1.9.0 + +* Thu Jan 20 2022 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Sep 14 2021 Sahana Prasad - 1.8.0-3 +- Rebuilt with OpenSSL 3.0.0 + +* Thu Jul 22 2021 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 21 2021 Remi Collet - 1.8.0-1 +- update to 1.8.0 +- enable zstd compression support + +* Tue Jan 26 2021 Fedora Release Engineering - 1.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 21 2020 Rex Dieter - 1.7.3-2 +- use %%cmake_build, %%cmake_install, %ctest + +* Wed Jul 15 2020 Remi Collet - 1.7.3-1 +- update to 1.7.3 +- drop patch merged upstream + +* Mon Jul 13 2020 Remi Collet - 1.7.2-1 +- update to 1.7.2 +- fix installation layout using merged patch from + https://github.com/nih-at/libzip/pull/190 + +* Mon Jun 15 2020 Remi Collet - 1.7.1-1 +- update to 1.7.1 + +* Fri Jun 5 2020 Remi Collet - 1.7.0-1 +- update to 1.7.0 +- patch zipconf.h to re-add missing LIBZIP_VERSION_* macros + +* Mon Feb 3 2020 Remi Collet - 1.6.1-1 - update to 1.6.1 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 24 2020 Remi Collet - 1.6.0-1 +- update to 1.6.0 - enable lzma support -* Tue May 7 2019 Remi Collet - 1.5.2-1 +* Thu Jul 25 2019 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Mar 12 2019 Remi Collet - 1.5.2-1 - update to 1.5.2 - add all explicit cmake options to ensure openssl is used even in local build with other lilbraries available +* Fri Feb 01 2019 Fedora Release Engineering - 1.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Apr 11 2018 Remi Collet - 1.5.1-1 - update to 1.5.1 - drop dependency on zlib-devel and bzip2-devel no more diff --git a/sources b/sources new file mode 100644 index 0000000..8dbe068 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libzip-1.10.1.tar.xz) = d24670ca3fa5def0345d6c531045683f11a124af7975dd724eae3bf3128a62fb8185a3d4df029c7c8232c7584e5ac55d18c431dc53b91e992fbbc8d119442930