diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-ds.spec | 71 |
3 files changed, 35 insertions, 40 deletions
@@ -2,4 +2,4 @@ ds ds support => enabled -ds version => 1.5.0 +ds version => 1.6.0 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #63 ds version 1.5.0 ] { +Extension [ <persistent> extension #138 ds version 1.6.0 ] { - Dependencies { Dependency [ json (Required) ] diff --git a/php-pecl-ds.spec b/php-pecl-ds.spec index b9156b5..8ae58ac 100644 --- a/php-pecl-ds.spec +++ b/php-pecl-ds.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-ds # -# Copyright (c) 2016-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2016-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -17,13 +17,15 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name ds +%global pie_vend php-ds +%global pie_proj ext-ds # After json %global ini_name 40-%{pecl_name}.ini %global sources %{pecl_name}-%{version} %global _configure ../%{sources}/configure # For test suite, see https://github.com/php-ds/tests/commits/master -# version 1.5.1 +# version 1.5.1 (version 1.6.0 exist but requires phpunit12, so PHP 8.3) %global gh_commit 3d14aa6f8c25d38d79c90924150c51636544e4a8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner php-ds @@ -32,8 +34,8 @@ Summary: Data Structures for PHP Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.5.0 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.6.0 +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz @@ -58,10 +60,15 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-json%{?_isa} -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# Extension +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +# PECL +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# PIE +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} %description @@ -76,7 +83,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{gh_project}-%{gh_commit} tests # Don't install/register tests, install examples as doc -%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} +sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd %{sources} # Sanity check, really often broken @@ -107,11 +114,12 @@ peclbuild() { --enable-ds \ --with-php-config=$1 -make %{?_smp_mflags} +%make_build } cd %{sources} %{__phpize} +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global cd ../NTS peclbuild %{__phpconfig} @@ -125,8 +133,7 @@ peclbuild %{__ztsphpconfig} %install %{?dtsenable} -make -C NTS \ - install INSTALL_ROOT=%{buildroot} +%make_install -C NTS # install config file install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -135,8 +142,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %if %{with_zts} -make -C ZTS \ - install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -147,26 +153,6 @@ do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %check [ -f %{php_extdir}/json.so ] && modules="-d extension=json.so" @@ -201,8 +187,7 @@ fi %files -%{?_licensedir:%license %{sources}/LICENSE} -%{!?_licensedir:%doc %{pecl_docdir}/%{pecl_name}} +%license %{sources}/LICENSE %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -215,6 +200,16 @@ fi %changelog +* Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 1.6.0-3 +- rebuild for PHP 8.5.0RC1 + +* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 1.6.0-2 +- rebuild for 8.5.0alpha3 + +* Sat May 3 2025 Remi Collet <remi@remirepo.net> - 1.6.0-1 +- update to 1.6.0 +- re-license spec file to CECILL-2.1 + * Wed Dec 20 2023 Remi Collet <remi@remirepo.net> - 1.5.0-1 - update to 1.5.0 |