From a8115a95dba83f6a53b90cde084c169dd1063a48 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Sat, 30 Mar 2024 05:28:28 +0000 Subject: [PATCH] import CS php-pecl-zip-1.22.3-1.module_el9+766+427f1f3d --- .gitignore | 2 +- .php-pecl-zip.metadata | 2 +- SOURCES/zip-tests.patch | 27 ---------- SPECS/php-pecl-zip.spec | 108 +++++++++++++++++++++++++++++++++------- 4 files changed, 91 insertions(+), 48 deletions(-) delete mode 100644 SOURCES/zip-tests.patch diff --git a/.gitignore b/.gitignore index 28ea08b..d6ab238 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/zip-1.18.2.tgz +SOURCES/zip-1.22.3.tgz diff --git a/.php-pecl-zip.metadata b/.php-pecl-zip.metadata index 38e9de5..91e9ed0 100644 --- a/.php-pecl-zip.metadata +++ b/.php-pecl-zip.metadata @@ -1 +1 @@ -16e8422eb7b4fa5171a6787c17d3f663abf67311 SOURCES/zip-1.18.2.tgz +e60876545544ab04bb1ee013d74066c29cdc156b SOURCES/zip-1.22.3.tgz diff --git a/SOURCES/zip-tests.patch b/SOURCES/zip-tests.patch deleted file mode 100644 index 78759ed..0000000 --- a/SOURCES/zip-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 527c199656850e86e8528ddf508c086d1147970b Mon Sep 17 00:00:00 2001 -From: Remi Collet -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-- - = 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,89 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \ %changelog -* Thu May 14 2020 Remi Collet - 1.18.2-1 +* Fri Nov 24 2023 Remi Collet - 1.22.3-1 +- update to 1.22.3 for PHP 8.2 RHEL-14699 + +* Thu May 19 2022 Remi Collet - 1.20.1-1 +- update to 1.20.1 for PHP 8.1 #2070040 + +* Mon Aug 09 2021 Mohan Boddu - 1.19.2-6 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Tue Jun 22 2021 Mohan Boddu - 1.19.2-5 +- Rebuilt for RHEL 9 BETA for openssl 3.0 + Related: rhbz#1971065 + +* Mon Apr 19 2021 Remi Collet - 1.19.2-4 +- Rebuilt for PHP 8. Related rhbz#1949319 + +* Fri Apr 16 2021 Mohan Boddu - 1.19.2-3 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.19.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Nov 23 2020 Remi Collet - 1.19.2-1 +- update to 1.19.2 + +* Wed Sep 30 2020 Remi Collet - 1.19.1-1 +- update to 1.19.1 + +* Tue Jul 28 2020 Fedora Release Engineering - 1.19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 8 2020 Remi Collet - 1.19.0-1 +- update to 1.19.0 + +* Fri Mar 20 2020 Remi Collet - 1.18.2-1 - update to 1.18.2 -* Tue May 7 2019 Remi Collet - 1.15.4-1 +* Thu Mar 19 2020 Remi Collet - 1.18.1-1 +- update to 1.18.1 + +* Mon Mar 16 2020 Remi Collet - 1.18.0-1 +- update to 1.18.0 + +* Mon Mar 9 2020 Remi Collet - 1.18.0~RC6-1 +- update to 1.18.0RC6 + +* Fri Feb 28 2020 Remi Collet - 1.17.2-1 +- Update to 1.17.2 + +* Mon Feb 3 2020 Remi Collet - 1.17.1-1 +- Update to 1.17.1 + +* Fri Jan 31 2020 Remi Collet - 1.17.0-1 +- Update to 1.17.0 + +* Wed Jan 29 2020 Remi Collet - 1.16.1-1 +- Update to 1.16.1 + +* Tue Jan 28 2020 Remi Collet - 1.16.0-1 +- Update to 1.16.0 + +* Thu Oct 03 2019 Remi Collet - 1.15.5-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php74 + +* Tue Sep 10 2019 Remi Collet - 1.15.5-1 +- Update to 1.15.5 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.15.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 1.15.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Oct 11 2018 Remi Collet - 1.15.4-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/php73 + +* Wed Oct 3 2018 Remi Collet - 1.15.4-1 - Update to 1.15.4 +* Fri Jul 13 2018 Fedora Release Engineering - 1.15.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 12 2018 Remi Collet - 1.15.3-1 - Update to 1.15.3