From 20a1008d75ef0119d649734ae4ee16fcc6543381 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Jun 2022 11:38:00 +0200 Subject: require minimal libzip version rebuild using libzip5 on EL-7 --- php-pecl-zip.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/php-pecl-zip.spec b/php-pecl-zip.spec index 951da09..67d7a82 100644 --- a/php-pecl-zip.spec +++ b/php-pecl-zip.spec @@ -15,7 +15,7 @@ %{?scl: %scl_package php-pecl-zip} -%if 0%{?rhel} == 7 || ( 0%{?scl:1} && 0%{?rhel} == 8 ) || 0%{?rhel} >= 9 +%if ( 0%{?scl:1} && 0%{?rhel} == 8 ) || 0%{?rhel} >= 9 %bcond_without move_to_opt %else %bcond_with move_to_opt @@ -40,7 +40,7 @@ Summary: A ZIP archive management extension Name: %{?scl_prefix}php-pecl-zip Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: https://pecl.php.net/package/zip @@ -59,7 +59,13 @@ Requires: %{?vendeur:%{vendeur}-}libzip%{?_isa} >= %{libzip_version} %global __requires_exclude ^libzip\\.so.*$ %else # Ensure latest version is used -BuildRequires: libzip-devel >= %{libzip_version} +%if 0%{?rhel} == 7 +BuildRequires: libzip5-devel >= %{libzip_version} +Requires: libzip5%{?_isa} >= %{libzip_version} +%else +BuildRequires: libzip-devel >= %{libzip_version} +Requires: libzip%{?_isa} >= %{libzip_version} +%endif %endif Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -273,6 +279,10 @@ fi %changelog +* Wed Jun 29 2022 Remi Collet - 1.21.0-3 +- require minimal libzip version +- rebuild using libzip5 on EL-7 + * Tue Jun 28 2022 Remi Collet - 1.21.0-2 - rebuild using libzip 1.9.2 (remi-libzip on EL) -- cgit