diff --git a/.gitignore b/.gitignore index 28ea08b..3f0fe72 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/zip-1.18.2.tgz +SOURCES/zip-1.22.7.tgz diff --git a/.php-pecl-zip.metadata b/.php-pecl-zip.metadata index 38e9de5..1ad459f 100644 --- a/.php-pecl-zip.metadata +++ b/.php-pecl-zip.metadata @@ -1 +1 @@ -16e8422eb7b4fa5171a6787c17d3f663abf67311 SOURCES/zip-1.18.2.tgz +1dec4991a1badd69bdca9d03da342e62aae4b2f8 SOURCES/zip-1.22.7.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 BuildRequires: php-pear @@ -38,33 +38,38 @@ BuildRequires: php-pear Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} -Provides: php-pecl(%{pecl_name}) = %{version} -Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} +# Extension Provides: php-%{pecl_name} = %{version}-%{release} Provides: php-%{pecl_name}%{?_isa} = %{version}-%{release} +# PECL +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} +# PIE +Provides: php-pie(%{pie_vend}/%{pie_proj}) = %{version} + +%if "%{php_base}" != "php" +Requires: %{php_base}-common%{?_isa} +Conflicts: php-pecl-%{pecl_name} +Provides: php-pecl-%{pecl_name} = %{version}-%{release} +Provides: php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +%endif %description Zip is an extension to create and read zip files. -%description -l fr -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 -%patch0 -p1 - +cd %{sources} # 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 @@ -77,104 +82,221 @@ cat >%{ini_name} << 'EOF' extension=%{pecl_name}.so EOF -%if %{with_zts} -: Duplicate sources tree for ZTS build -cp -pr NTS ZTS -%endif - %build -cd NTS -%{_bindir}/phpize +cd %{sources} +%{__phpize} +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global + %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 - -make %{?_smp_mflags} -%endif +%make_build %install -make -C NTS install INSTALL_ROOT=%{buildroot} +: Install the configuration file install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} -# Install XML package description +: Install XML package description install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml -%if %{with_zts} -make -C ZTS install INSTALL_ROOT=%{buildroot} -install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} -%endif +cd %{sources} +: Install the extension +%make_install -# Documentation -cd NTS +: Install the Documentation 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 -: minimal load test of NTS extension -%{_bindir}/php --no-php-ini \ +cd %{sources} +: minimal load test of the extension +%{__php} --no-php-ini \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} + --modules | grep '^%{pecl_name}$' -: 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 - -%if %{with_zts} -cd ../ZTS -: minimal load test of ZTS extension -%{_bindir}/zts-php --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" \ -REPORT_EXIT_STATUS=1 \ -NO_INTERACTION=1 \ -TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \ -%{_bindir}/zts-php -n run-tests.php --show-diff -%endif +: upstream test suite +TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ +TEST_PHP_EXECUTABLE=%{__php} \ +%{__php} -n run-tests.php -q --show-diff %files -%license NTS/LICENSE +%license %{sources}/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so -%if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%{php_ztsextdir}/%{pecl_name}.so -%endif - %changelog -* Thu May 14 2020 Remi Collet - 1.18.2-1 +* Tue Oct 28 2025 Remi Collet - 1.22.7-2 +- fix dependencies + +* Thu Sep 25 2025 Remi Collet - 1.22.7-1 +- update to 1.22.7 + +* Mon Sep 8 2025 Remi Collet - 1.22.6-1 +- build for php8.4 + +* Wed May 7 2025 Remi Collet - 1.22.6-1 +- update to 1.22.6 + +* Thu Feb 20 2025 Remi Collet - 1.22.5-1 +- update to 1.22.5 +- re-license spec file to CECILL-2.1 + +* Sat Jan 18 2025 Fedora Release Engineering - 1.22.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Oct 14 2024 Remi Collet - 1.22.4-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php84 + +* Thu Sep 26 2024 Remi Collet - 1.23.4-1 +- update to 1.22.4 +- modernize spec file + +* Thu Aug 22 2024 Remi Collet - 1.22.3-6 +- rebuild for broken ABI in 8.3.10, fixed in 8.3.11RC2 + +* Fri Jul 19 2024 Fedora Release Engineering - 1.22.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Apr 16 2024 Remi Collet - 1.22.3-4 +- drop 32-bit support + https://fedoraproject.org/wiki/Changes/php_no_32_bit + +* Thu Jan 25 2024 Fedora Release Engineering - 1.22.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.22.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Nov 14 2023 Remi Collet - 1.22.3-1 +- update to 1.22.3 +- build out of sources tree + +* Tue Oct 03 2023 Remi Collet - 1.22.2-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php83 + +* Thu Aug 24 2023 Remi Collet - 1.22.2-1 +- update to 1.22.2 + +* Fri Jul 21 2023 Fedora Release Engineering - 1.22.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 29 2023 Remi Collet - 1.22.1-1 +- update to 1.22.1 + +* Thu Apr 20 2023 Remi Collet - 1.21.1-3 +- use SPDX license ID + +* Wed Oct 05 2022 Remi Collet - 1.21.1-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php82 + +* Fri Sep 16 2022 Remi Collet - 1.21.1-1 +- update to 1.21.1 + +* Fri Jul 22 2022 Fedora Release Engineering - 1.21.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 28 2022 Remi Collet - 1.21.0-1 +- update to 1.21.0 + +* Mon May 2 2022 Remi Collet - 1.20.1-1 +- update to 1.20.1 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.20.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Oct 28 2021 Remi Collet - 1.20.0-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php81 + +* Tue Oct 12 2021 Remi Collet - 1.20.0-1 +- update to 1.20.0 +- run test suite in parallel + +* Wed Sep 1 2021 Remi Collet - 1.19.4-1 +- update to 1.19.4 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.19.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 7 2021 Remi Collet - 1.19.3-1 +- update to 1.19.3 + +* Thu Mar 4 2021 Remi Collet - 1.19.2-3 +- rebuild for https://fedoraproject.org/wiki/Changes/php80 + +* 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