summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--php-pecl-zip.spec28
2 files changed, 19 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
package-*.xml
*.tgz
+*.tar.bz2
*.tar.gz
*.tar.xz
*.tar.xz.asc
diff --git a/php-pecl-zip.spec b/php-pecl-zip.spec
index e60fe86..5479a2d 100644
--- a/php-pecl-zip.spec
+++ b/php-pecl-zip.spec
@@ -22,20 +22,19 @@
#global upstream_prever dev
#global upstream_lower DEV
+%global libzip_version 1.7.3
+
%if "%{php_version}" < "5.6"
%global ini_name %{pecl_name}.ini
%else
%global ini_name 40-%{pecl_name}.ini
%endif
-# Ensure we use save version as minor version may introduce new symbols
-%global buildver %(pkg-config --silence-errors --modversion libzip 2>/dev/null || echo 65536)
-
Summary: A ZIP archive management extension
Summary(fr): Une extension de gestion des ZIP
Name: %{?scl_prefix}php-pecl-zip
Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
Group: Development/Languages
URL: https://pecl.php.net/package/zip
@@ -44,17 +43,23 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstre
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel
-# Version 1.2.0 for encryption support
-BuildRequires: pkgconfig(libzip) >= 1.5
BuildRequires: zlib-devel
BuildRequires: %{?scl_prefix}php-pear
+%if 0%{?rhel} >= 8 && 0%{?scl:1}
+# use SCLized libzip
+BuildRequires: %{?scl_prefix}libzip-devel >= %{libzip_version}
+Requires: %{?scl_prefix}libzip%{?_isa} >= %{libzip_version}
+%global __requires_exclude ^libzip\\.so.*$
+%else
+# Ensure latest version is used
+BuildRequires: pkgconfig(libzip) >= %{libzip_version}
%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
-Requires: libzip%{?_isa} >= %{buildver}
+Requires: libzip%{?_isa} >= %{libzip_version}
%else
-Requires: libzip5%{?_isa} >= %{buildver}
+Requires: libzip5%{?_isa} >= %{libzip_version}
+%endif
%endif
-
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
@@ -264,9 +269,10 @@ fi
%endif
-#### TODO: SCLs on EL-8 still use libzip from default stream (7.2 => 1.5.1)
-
%changelog
+* Thu Nov 5 2020 Remi Collet <remi@remirepo.net> - 1.19.1-2
+- rebuild against latest libzip SCL packages (EL-8)
+
* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.19.1-1
- update to 1.19.1