.gitignore

@@ -1 +1 @@
-SOURCES/zip-1.19.2.tgz
+SOURCES/zip-1.22.3.tgz

.php-pecl-zip.metadata

@@ -1 +1 @@
-c912f7eae400d5f23f20b28cdc9c4337140219e0 SOURCES/zip-1.19.2.tgz
+e60876545544ab04bb1ee013d74066c29cdc156b SOURCES/zip-1.22.3.tgz

SPECS/php-pecl-zip.spec

@@ -1,7 +1,7 @@
 # Fedora spec file for php-pecl-zip
 #
-# Copyright (c) 2013-2021 Remi Collet
+# Copyright (c) 2013-2023 Remi Collet
-# License: CC-BY-SA
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -14,18 +14,20 @@
 %global with_zts  0%{?__ztsphp:1}
 %global ini_name  40-%{pecl_name}.ini
 
-%global upstream_version 1.19.2
+%global upstream_version 1.22.3
 #global upstream_prever  RC6
+%global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}
+%global _configure       ../%{sources}/configure
 
 Summary:      A ZIP archive management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
 Version:      %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:      6%{?dist}
+Release:      4%{?dist}
-License:      PHP
+License:      PHP-3.01
 URL:          https://pecl.php.net/package/zip
 
-Source0:      https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
+Source0:      https://pecl.php.net/get/%{sources}.tgz
 
 BuildRequires: make
 BuildRequires: gcc
@@ -52,14 +54,13 @@ Zip est une extension pour créer et lire les archives au format ZIP.
 
 %prep 
 %setup -c -q
-mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
     -e '/LICENSE/s/role="doc"/role="src"/' \
     -i package.xml
 
-cd NTS
+cd %{sources}
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php8/php_zip.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -74,29 +75,30 @@ cat >%{ini_name} << 'EOF'
 extension=%{pecl_name}.so
 EOF
 
+mkdir NTS
 %if %{with_zts}
-: Duplicate sources tree for ZTS build
+mkdir ZTS
-cp -pr NTS ZTS
 %endif
 
 
 %build
-cd NTS
+cd %{sources}
-%{_bindir}/phpize
+%{__phpize}
+
+cd ../NTS
 %configure \
   --with-libzip \
   --with-libdir=%{_lib} \
-  --with-php-config=%{_bindir}/php-config
+  --with-php-config=%{__phpconfig}
 
 make %{?_smp_mflags}
 
 %if %{with_zts}
 cd ../ZTS
-%{_bindir}/zts-phpize
 %configure \
   --with-libzip \
   --with-libdir=%{_lib} \
-  --with-php-config=%{_bindir}/zts-php-config
+  --with-php-config=%{__ztsphpconfig}
 
 make %{?_smp_mflags}
 %endif
@@ -115,44 +117,39 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 # Documentation
-cd NTS
+cd %{sources}
 for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
 do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
 %check
-cd NTS
+cd %{sources}
 : minimal load test of NTS extension
-%{_bindir}/php --no-php-ini \
+%{__php} --no-php-ini \
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
 : upstream test suite for NTS extension
-TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
+TEST_PHP_ARGS="-n -d extension_dir=$PWD/../NTS/modules -d extension=%{pecl_name}.so" \
-REPORT_EXIT_STATUS=1 \
+TEST_PHP_EXECUTABLE=%{__php} \
-NO_INTERACTION=1 \
+%{__php} -n run-tests.php -q --show-diff
-TEST_PHP_EXECUTABLE=%{_bindir}/php \
-%{_bindir}/php -n run-tests.php --show-diff
 
 %if %{with_zts}
-cd ../ZTS
 : minimal load test of ZTS extension
-%{_bindir}/zts-php --no-php-ini \
+%{__ztsphp} --no-php-ini \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
 : upstream test suite for ZTS extension
-TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
+TEST_PHP_ARGS="-n -d extension_dir=$PWD/../ZTS/modules -d extension=%{pecl_name}.so" \
-REPORT_EXIT_STATUS=1 \
+TEST_PHP_EXECUTABLE=%{__ztsphp} \
-NO_INTERACTION=1 \
+%{__ztsphp} -n run-tests.php -q --show-diff
-TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
-%{_bindir}/zts-php -n run-tests.php --show-diff
 %endif
 
 
 %files
-%license NTS/LICENSE
+%license %{sources}/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -166,19 +163,70 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
 
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.19.2-6
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.22.3-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for June 2024 mass rebuild
-  Related: rhbz#1991688
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Nov 14 2023 Remi Collet <remi@remirepo.net> - 1.22.3-1
+- update to 1.22.3
+- build out of sources tree
+
+* Tue Oct 03 2023 Remi Collet <remi@remirepo.net> - 1.22.2-2
+- rebuild for https://fedoraproject.org/wiki/Changes/php83
+
+* Thu Aug 24 2023 Remi Collet <remi@remirepo.net> - 1.22.2-1
+- update to 1.22.2
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jun 29 2023 Remi Collet <remi@remirepo.net> - 1.22.1-1
+- update to 1.22.1
+
+* Thu Apr 20 2023 Remi Collet <remi@remirepo.net> - 1.21.1-3
+- use SPDX license ID
+
+* Wed Oct 05 2022 Remi Collet <remi@remirepo.net> - 1.21.1-2
+- rebuild for https://fedoraproject.org/wiki/Changes/php82
+
+* Fri Sep 16 2022 Remi Collet <remi@remirepo.net> - 1.21.1-1
+- update to 1.21.1
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 28 2022 Remi Collet <remi@remirepo.net> - 1.21.0-1
+- update to 1.21.0
+
+* Mon May  2 2022 Remi Collet <remi@remirepo.net> - 1.20.1-1
+- update to 1.20.1
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Oct 28 2021 Remi Collet <remi@remirepo.net> - 1.20.0-2
+- rebuild for https://fedoraproject.org/wiki/Changes/php81
+
+* Tue Oct 12 2021 Remi Collet <remi@remirepo.net> - 1.20.0-1
+- update to 1.20.0
+- run test suite in parallel
+
+* Wed Sep  1 2021 Remi Collet <remi@remirepo.net> - 1.19.4-1
+- update to 1.19.4
 
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.19.2-5
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.3-2
-- Rebuilt for RHEL 9 BETA for openssl 3.0
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-  Related: rhbz#1971065
 
-* Mon Apr 19 2021 Remi Collet <rcollet@redhat.com> - 1.19.2-4
+* Mon Jun  7 2021 Remi Collet <remi@remirepo.net> - 1.19.3-1
-- Rebuilt for PHP 8. Related rhbz#1949319
+- update to 1.19.3
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.19.2-3
+* Thu Mar  4 2021 Remi Collet <remi@remirepo.net> - 1.19.2-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- rebuild for https://fedoraproject.org/wiki/Changes/php80
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild