From 55aae11197e474d7b43287b72ea614370c9c98a5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 16 Sep 2022 08:30:09 +0200
Subject: update to 1.21.1

---
 php-pecl-zip.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'php-pecl-zip.spec')

diff --git a/php-pecl-zip.spec b/php-pecl-zip.spec
index 7919458..b73231b 100644
--- a/php-pecl-zip.spec
+++ b/php-pecl-zip.spec
@@ -24,7 +24,7 @@
 %global with_zts       0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name      zip
 
-%global upstream_version 1.21.0
+%global upstream_version 1.21.1
 #global upstream_prever  dev
 #global upstream_lower   DEV
 
@@ -40,15 +40,13 @@
 Summary:      A ZIP archive management extension
 Name:         %{?scl_prefix}php-pecl-zip
 Version:      %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:      5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:      1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:      PHP
 Group:        Development/Languages
 URL:          https://pecl.php.net/package/zip
 
 Source0:      https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-Patch0:       %{pecl_name}-upstream.patch
-
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
@@ -144,8 +142,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php7/php_zip.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}" -a "x${extver}" != "x%{upstream_version}-%{?upstream_prever}"; then
@@ -227,11 +223,13 @@ cd NTS
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
+%if %{with tests}
 : upstream test suite for NTS extension
 TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
 TEST_PHP_EXECUTABLE=%{_bindir}/php \
 %{_bindir}/php -n run-tests.php $OPT
+%endif
 
 %if %{with_zts}
 cd ../ZTS
@@ -240,12 +238,14 @@ cd ../ZTS
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
+%if %{with tests}
 : upstream test suite for ZTS extension
 TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
 TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
 %{_bindir}/zts-php -n run-tests.php $OPT
 %endif
+%endif
 
 
 %if 0%{?fedora} < 24 && 0%{?rhel} < 8
@@ -283,6 +283,9 @@ fi
 
 
 %changelog
+* Fri Sep 16 2022 Remi Collet <remi@remirepo.net> - 1.21.1-1
+- update to 1.21.1
+
 * Thu Sep  1 2022 Remi Collet <remi@remirepo.net> - 1.21.0-5
 - rebuild for PHP 8.2.0RC1
 
-- 
cgit