From 61f5a4f5a41d6db593bc5950c02848aaef79fc17 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Sep 2024 14:02:30 +0200 Subject: update to 1.11.1 --- libzip.spec | 48 ++++++++---------------------------------------- 1 file changed, 8 insertions(+), 40 deletions(-) (limited to 'libzip.spec') diff --git a/libzip.spec b/libzip.spec index 54dacbd..b03844e 100644 --- a/libzip.spec +++ b/libzip.spec @@ -9,8 +9,6 @@ # Please preserve changelog entries # -## FOR EL-7 -## build as libzip5 ## FOR EL-8 ## 1st build --with move_to_opt for SCL ## 2nd build --without move_to_opt for module @@ -38,14 +36,10 @@ %global __arch_install_post /bin/true Name: %{?vendeur:%{vendeur}-}%{libname} %else -%if 0%{?rhel} == 7 -Name: %{libname}%{soname} -%else Name: %{libname} %endif -%endif -Version: 1.10.1 +Version: 1.11.1 Release: 1%{?dist} Summary: C library for reading, creating, and modifying zip archives @@ -61,20 +55,12 @@ BuildRequires: xz-devel >= 5.2 # for ZSTD_minCLevel BuildRequires: libzstd-devel >= 1.3.6 Requires: libzstd%{?_isa} >= 1.3.6 -%if 0%{?rhel} == 7 -BuildRequires: cmake3 >= 3.4 -%else BuildRequires: cmake >= 3.4 -%endif BuildRequires: mandoc %if %{with tests} BuildRequires: nihtest %endif -%if 0%{?rhel} == 7 -# RHEL have commands in main package -Provides: %{libname} = %{version}-%{release} -%endif %if %{with move_to_opt} %if 0%{?rhel} == 8 Obsoletes: php56-libzip < %{version} @@ -112,11 +98,6 @@ The API is documented by man pages. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 7 -Conflicts: %{libname}-last-devel < %{version} -Conflicts: %{libname}-devel < %{version} -Provides: %{libname}-devel = %{version}-%{release} -%endif %if %{with move_to_opt} && 0%{?rhel} == 8 Obsoletes: php56-libzip-devel < %{version} Obsoletes: php70-libzip-devel < %{version} @@ -138,12 +119,6 @@ developing applications that use %{name}. Summary: Command line tools from %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 7 -Conflicts: %{libname}-last-tools < %{version} -Conflicts: %{libname}-tools < %{version} -# RHEL have commands in main package -Conflicts: %{libname} < 1.1 -%endif %if %{with move_to_opt} && 0%{?rhel} == 8 Obsoletes: php56-libzip-tools < %{version} Obsoletes: php70-libzip-tools < %{version} @@ -172,19 +147,11 @@ rm INSTALL.md # drop skipped test which make test suite fails (cmake issue ?) sed -e '/clone-fs-/d' \ -%if 0%{?rhel} == 7 - -e '/add_from_stdin/d' \ -%endif -i regress/CMakeLists.txt %build -%if 0%{?rhel} == 7 -sed -e 's/COMMAND cmake /COMMAND cmake3 /' -i CMakeLists.txt regress/CMakeLists.txt -%cmake3 \ -%else %cmake . \ -%endif -DENABLE_COMMONCRYPTO:BOOL=OFF \ -DENABLE_GNUTLS:BOOL=OFF \ -DENABLE_MBEDTLS:BOOL=OFF \ @@ -232,12 +199,6 @@ make check %endif -%if 0%{?fedora} < 28 && 0%{?rhel} < 8 -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig -%endif - - %files %license LICENSE %{_libdir}/libzip.so.%{soname}* @@ -280,6 +241,13 @@ make check %changelog +* Thu Sep 19 2024 Remi Collet - 1.11.1-1 +- update to 1.11.1 + +* Thu Sep 19 2024 Remi Collet - 1.11-1 +- update to 1.11 +- open https://github.com/nih-at/libzip/issues/455 LIBZIP_VERSION_MICRO is empty + * Wed Aug 23 2023 Remi Collet - 1.10.1-1 - update to 1.10.1 -- cgit