update to 1.22.3

build out of sources tree
This commit is contained in:
Remi Collet 2023-11-15 07:41:58 +01:00
parent 9fd2b7b837
commit bb3ebc20ce
3 changed files with 31 additions and 25 deletions

1
.gitignore vendored
View File

@ -38,3 +38,4 @@ php-pecl-zip.spec~
/zip-1.21.1.tgz /zip-1.21.1.tgz
/zip-1.22.1.tgz /zip-1.22.1.tgz
/zip-1.22.2.tgz /zip-1.22.2.tgz
/zip-1.22.3.tgz

View File

@ -14,18 +14,20 @@
%global with_zts 0%{?__ztsphp:1} %global with_zts 0%{?__ztsphp:1}
%global ini_name 40-%{pecl_name}.ini %global ini_name 40-%{pecl_name}.ini
%global upstream_version 1.22.2 %global upstream_version 1.22.3
#global upstream_prever RC6 #global upstream_prever RC6
%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
%global _configure ../%{sources}/configure
Summary: A ZIP archive management extension Summary: A ZIP archive management extension
Summary(fr): Une extension de gestion des ZIP Summary(fr): Une extension de gestion des ZIP
Name: php-pecl-zip Name: php-pecl-zip
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 2%{?dist} Release: 1%{?dist}
License: PHP-3.01 License: PHP-3.01
URL: https://pecl.php.net/package/zip 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: make
BuildRequires: gcc BuildRequires: gcc
@ -52,14 +54,13 @@ Zip est une extension pour créer et lire les archives au format ZIP.
%prep %prep
%setup -c -q %setup -c -q
mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
# Don't install/register tests # Don't install/register tests
sed -e 's/role="test"/role="src"/' \ sed -e 's/role="test"/role="src"/' \
-e '/LICENSE/s/role="doc"/role="src"/' \ -e '/LICENSE/s/role="doc"/role="src"/' \
-i package.xml -i package.xml
cd NTS cd %{sources}
# Sanity check, really often broken # 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}' php8/php_zip.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@ -74,29 +75,30 @@ cat >%{ini_name} << 'EOF'
extension=%{pecl_name}.so extension=%{pecl_name}.so
EOF EOF
mkdir NTS
%if %{with_zts} %if %{with_zts}
: Duplicate sources tree for ZTS build mkdir ZTS
cp -pr NTS ZTS
%endif %endif
%build %build
cd NTS cd %{sources}
%{_bindir}/phpize %{__phpize}
cd ../NTS
%configure \ %configure \
--with-libzip \ --with-libzip \
--with-libdir=%{_lib} \ --with-libdir=%{_lib} \
--with-php-config=%{_bindir}/php-config --with-php-config=%{__phpconfig}
make %{?_smp_mflags} make %{?_smp_mflags}
%if %{with_zts} %if %{with_zts}
cd ../ZTS cd ../ZTS
%{_bindir}/zts-phpize
%configure \ %configure \
--with-libzip \ --with-libzip \
--with-libdir=%{_lib} \ --with-libdir=%{_lib} \
--with-php-config=%{_bindir}/zts-php-config --with-php-config=%{__ztsphpconfig}
make %{?_smp_mflags} make %{?_smp_mflags}
%endif %endif
@ -115,40 +117,39 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif %endif
# Documentation # Documentation
cd NTS cd %{sources}
for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done done
%check %check
cd NTS cd %{sources}
: minimal load test of NTS extension : minimal load test of NTS extension
%{_bindir}/php --no-php-ini \ %{__php} --no-php-ini \
--define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
--modules | grep %{pecl_name} --modules | grep %{pecl_name}
: upstream test suite for NTS extension : 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" \
TEST_PHP_EXECUTABLE=%{_bindir}/php \ TEST_PHP_EXECUTABLE=%{__php} \
%{_bindir}/php -n run-tests.php -q --show-diff %{__php} -n run-tests.php -q --show-diff
%if %{with_zts} %if %{with_zts}
cd ../ZTS
: minimal load test of ZTS extension : minimal load test of ZTS extension
%{_bindir}/zts-php --no-php-ini \ %{__ztsphp} --no-php-ini \
--define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
--modules | grep %{pecl_name} --modules | grep %{pecl_name}
: upstream test suite for ZTS extension : 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" \
TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \ TEST_PHP_EXECUTABLE=%{__ztsphp} \
%{_bindir}/zts-php -n run-tests.php -q --show-diff %{__ztsphp} -n run-tests.php -q --show-diff
%endif %endif
%files %files
%license NTS/LICENSE %license %{sources}/LICENSE
%doc %{pecl_docdir}/%{pecl_name} %doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml %{pecl_xmldir}/%{name}.xml
@ -162,6 +163,10 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
%changelog %changelog
* 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 * Tue Oct 03 2023 Remi Collet <remi@remirepo.net> - 1.22.2-2
- rebuild for https://fedoraproject.org/wiki/Changes/php83 - rebuild for https://fedoraproject.org/wiki/Changes/php83

View File

@ -1 +1 @@
SHA512 (zip-1.22.2.tgz) = 4b73983b86889725f9de7776e91af2078c1d78645d81f4094aee21911daa34c3229f3867dee67e69925c14b422faef4118cdf7178909964d16ea670b9b3a4b9c SHA512 (zip-1.22.3.tgz) = 5896352717dee850d222a78d617c6f37ccd932ad9e5ccb44ecd90cb7e2070dc1a391fdb7a626b32eb8f5c1565552ca0a375e5f75de483f772f9d5f154a858e85