.gitignore

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

.php-pecl-zip.metadata

@@ -1 +1 @@
-c912f7eae400d5f23f20b28cdc9c4337140219e0 SOURCES/zip-1.19.2.tgz
+37b9b074d848ed391581fca825d981a634ef8f07 SOURCES/zip-1.15.4.tgz

SPECS/php-pecl-zip.spec

@@ -1,6 +1,6 @@
 # Fedora spec file for php-pecl-zip
 #
-# Copyright (c) 2013-2021 Remi Collet
+# Copyright (c) 2013-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -14,21 +14,16 @@
 %global with_zts  0%{?__ztsphp:1}
 %global ini_name  40-%{pecl_name}.ini
 
-%global upstream_version 1.19.2
-#global upstream_prever  RC6
-
 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}}
+Version:      1.15.4
-Release:      6%{?dist}
+Release:      1%{?dist}
 License:      PHP
-URL:          https://pecl.php.net/package/zip
+URL:          http://pecl.php.net/package/zip
 
-Source0:      https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
+Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-BuildRequires: make
-BuildRequires: gcc
 BuildRequires: php-devel
 BuildRequires: pkgconfig(libzip) >= 1.0.0
 BuildRequires: zlib-devel
@@ -52,18 +47,17 @@ 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 %{pecl_name}-%{version}
 # Sanity check, really often broken
-extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php8/php_zip.h)
+extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php5/php_zip.h)
-if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
+if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
+   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}.
    exit 1
 fi
 
@@ -76,12 +70,12 @@ EOF
 
 %if %{with_zts}
 : Duplicate sources tree for ZTS build
-cp -pr NTS ZTS
+cp -pr %{pecl_name}-%{version} %{pecl_name}-zts
 %endif
 
 
 %build
-cd NTS
+cd %{pecl_name}-%{version}
 %{_bindir}/phpize
 %configure \
   --with-libzip \
@@ -91,7 +85,7 @@ cd NTS
 make %{?_smp_mflags}
 
 %if %{with_zts}
-cd ../ZTS
+cd ../%{pecl_name}-zts
 %{_bindir}/zts-phpize
 %configure \
   --with-libzip \
@@ -103,26 +97,26 @@ make %{?_smp_mflags}
 
 
 %install
-make -C NTS install INSTALL_ROOT=%{buildroot}
+make -C %{pecl_name}-%{version} install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
 # 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}
+make -C %{pecl_name}-zts install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 # Documentation
-cd NTS
+cd %{pecl_name}-%{version}
 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 %{pecl_name}-%{version}
 : minimal load test of NTS extension
 %{_bindir}/php --no-php-ini \
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
@@ -133,10 +127,10 @@ 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
 
 %if %{with_zts}
-cd ../ZTS
+cd ../%{pecl_name}-zts
 : minimal load test of ZTS extension
 %{_bindir}/zts-php --no-php-ini \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
@@ -147,12 +141,12 @@ 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
 %endif
 
 
 %files
-%license NTS/LICENSE
+%license %{pecl_name}-%{version}/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -166,83 +160,9 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
 
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.19.2-6
+* Tue May  7 2019 Remi Collet <remi@remirepo.net> - 1.15.4-1
-- 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
-
-* 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