.gitignore

@@ -1 +1 @@
-SOURCES/zip-1.18.2.tgz
+SOURCES/zip-1.20.1.tgz

.php-pecl-zip.metadata

@@ -1 +1 @@
-16e8422eb7b4fa5171a6787c17d3f663abf67311 SOURCES/zip-1.18.2.tgz
+509f6ba66eefc7ce9e90a72878600e8f576e4d97 SOURCES/zip-1.20.1.tgz

SOURCES/zip-tests.patch

@@ -1,27 +0,0 @@
-From 527c199656850e86e8528ddf508c086d1147970b Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 18 May 2020 07:48:59 +0200
-Subject: [PATCH] relax test (TZ issue)
-
----
- tests/bug50678.phpt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/bug50678.phpt b/tests/bug50678.phpt
-index 156318e..a09c54d 100644
---- a/tests/bug50678.phpt
-+++ b/tests/bug50678.phpt
-@@ -18,11 +18,11 @@ $zip->open($filename);
- $zip->extractTo($dirname);
- $zip->close();
- 
--var_dump(date('Ymd', filemtime($dirname . '/entry1.txt')));
-+var_dump(date('Ym', filemtime($dirname . '/entry1.txt')));
- ?>
- Done
- --EXPECT--
--string(8) "20060706"
-+string(6) "200607"
- Done
- --CLEAN--
- <?php

SPECS/php-pecl-zip.spec

@@ -1,6 +1,6 @@
-# RHEL / Fedora spec file for php-pecl-zip
+# Fedora spec file for php-pecl-zip
 #
-# Copyright (c) 2013-2020 Remi Collet
+# Copyright (c) 2013-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -14,7 +14,7 @@
 %global with_zts  0%{?__ztsphp:1}
 %global ini_name  40-%{pecl_name}.ini
 
-%global upstream_version 1.18.2
+%global upstream_version 1.20.1
 #global upstream_prever  RC6
 
 Summary:      A ZIP archive management extension
@@ -27,9 +27,8 @@ URL:          https://pecl.php.net/package/zip
 
 Source0:      https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-# Upstream patch for test suite
-Patch0:       %{pecl_name}-tests.patch
-
+BuildRequires: make
+BuildRequires: gcc
 BuildRequires: php-devel
 BuildRequires: pkgconfig(libzip) >= 1.0.0
 BuildRequires: zlib-devel
@@ -61,10 +60,8 @@ 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}' php5/php_zip.h)
+extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php8/php_zip.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
    : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
@@ -133,10 +130,8 @@ cd NTS
 
 : upstream test suite for NTS extension
 TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
-REPORT_EXIT_STATUS=1 \
-NO_INTERACTION=1 \
 TEST_PHP_EXECUTABLE=%{_bindir}/php \
-%{_bindir}/php -n run-tests.php --show-diff
+%{_bindir}/php -n run-tests.php -q --show-diff
 
 %if %{with_zts}
 cd ../ZTS
@@ -147,10 +142,8 @@ cd ../ZTS
 
 : upstream test suite for ZTS extension
 TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
-REPORT_EXIT_STATUS=1 \
-NO_INTERACTION=1 \
 TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
-%{_bindir}/zts-php -n run-tests.php --show-diff
+%{_bindir}/zts-php -n run-tests.php -q --show-diff
 %endif
 
 
@@ -169,12 +162,86 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
 
 
 %changelog
-* Thu May 14 2020 Remi Collet <rcollet@redhat.com> - 1.18.2-1
+* Thu May 19 2022 Remi Collet <rcollet@redhat.com> - 1.20.1-1
+- update to 1.20.1 for PHP 8.1 #2070040
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.19.2-6
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.19.2-5
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Mon Apr 19 2021 Remi Collet <rcollet@redhat.com> - 1.19.2-4
+- Rebuilt for PHP 8. Related rhbz#1949319
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.19.2-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Nov 23 2020 Remi Collet <remi@remirepo.net> - 1.19.2-1
+- update to 1.19.2
+
+* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.19.1-1
+- update to 1.19.1
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun  8 2020 Remi Collet <remi@remirepo.net> - 1.19.0-1
+- update to 1.19.0
+
+* Fri Mar 20 2020 Remi Collet <remi@remirepo.net> - 1.18.2-1
 - update to 1.18.2
 
-* Tue May  7 2019 Remi Collet <remi@remirepo.net> - 1.15.4-1
+* Thu Mar 19 2020 Remi Collet <remi@remirepo.net> - 1.18.1-1
+- update to 1.18.1
+
+* Mon Mar 16 2020 Remi Collet <remi@remirepo.net> - 1.18.0-1
+- update to 1.18.0
+
+* Mon Mar  9 2020 Remi Collet <remi@remirepo.net> - 1.18.0~RC6-1
+- update to 1.18.0RC6
+
+* Fri Feb 28 2020 Remi Collet <remi@remirepo.net> - 1.17.2-1
+- Update to 1.17.2
+
+* Mon Feb  3 2020 Remi Collet <remi@remirepo.net> - 1.17.1-1
+- Update to 1.17.1
+
+* Fri Jan 31 2020 Remi Collet <remi@remirepo.net> - 1.17.0-1
+- Update to 1.17.0
+
+* Wed Jan 29 2020 Remi Collet <remi@remirepo.net> - 1.16.1-1
+- Update to 1.16.1
+
+* Tue Jan 28 2020 Remi Collet <remi@remirepo.net> - 1.16.0-1
+- Update to 1.16.0
+
+* Thu Oct 03 2019 Remi Collet <remi@remirepo.net> - 1.15.5-2
+- rebuild for https://fedoraproject.org/wiki/Changes/php74
+
+* Tue Sep 10 2019 Remi Collet <remi@remirepo.net> - 1.15.5-1
+- Update to 1.15.5
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Oct 11 2018 Remi Collet <remi@remirepo.net> - 1.15.4-2
+- Rebuild for https://fedoraproject.org/wiki/Changes/php73
+
+* Wed Oct  3 2018 Remi Collet <remi@remirepo.net> - 1.15.4-1
 - Update to 1.15.4
 
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Tue Jun 12 2018 Remi Collet <remi@remirepo.net> - 1.15.3-1
 - Update to 1.15.3