diff options
| author | Remi Collet <remi@remirepo.net> | 2025-09-04 11:18:58 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-09-04 11:18:58 +0200 |
| commit | 0990d28c462351f48fb734240c923a8badd79490 (patch) | |
| tree | 508e273facccde060be37982193c4267f743d950 /php-pecl-teds.spec | |
| parent | 2c3c897ecfe1c4a6657446bbc48bffcbcb580aff (diff) | |
more patch for test suite with PHP 8.5.0beta2 from
https://github.com/TysonAndre/pecl-teds/pull/205
Diffstat (limited to 'php-pecl-teds.spec')
| -rw-r--r-- | php-pecl-teds.spec | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/php-pecl-teds.spec b/php-pecl-teds.spec index 362be77..1e1b691 100644 --- a/php-pecl-teds.spec +++ b/php-pecl-teds.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-teds # -# Copyright (c) 2021-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2021-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -23,13 +23,15 @@ Summary: Tentative Extra Data Structures Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD-3-Clause URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz Patch0: %{pecl_name}-php83.patch +Patch1: %{pecl_name}-php84.patch +Patch2: %{pecl_name}-php85.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -57,11 +59,13 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO # Don't install/register tests sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/COPYING/s/role="doc"/role="src"/' } \ + -e '/COPYING/s/role="doc"/role="src"/' \ -i package.xml cd %{sources} %patch -P0 -p1 -b.pr204 +%patch -P1 -p1 -b.pr205 +%patch -P2 -p1 -b.pr205 # Check version as upstream often forget to update this extver=$(sed -n '/define PHP_TEDS_VERSION/{s/.* "//;s/".*$//;p}' php_teds.h) @@ -94,15 +98,16 @@ peclconf() { cd %{sources} %{__phpize} +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global cd ../NTS peclconf %{__phpconfig} -make %{?_smp_mflags} +%make_build %if %{with_zts} cd ../ZTS peclconf %{__ztsphpconfig} -make %{?_smp_mflags} +%make_build %endif @@ -110,7 +115,7 @@ make %{?_smp_mflags} %{?dtsenable} # Install the NTS stuff -make -C NTS install INSTALL_ROOT=%{buildroot} +%make_install -C NTS install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} # Install XML package description @@ -118,7 +123,7 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml # Install the ZTS stuff %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 @@ -150,28 +155,8 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %endif -%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 - - %files -%{?_licensedir:%license %{sources}/COPYING} +%license %{sources}/COPYING %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -185,6 +170,15 @@ fi %changelog +* Thu Sep 4 2025 Remi Collet <remi@remirepo.net> - 1.3.0-4 +- re-license spec file to CECILL-2.1 +- more patch for test suite with PHP 8.5.0beta2 from + https://github.com/TysonAndre/pecl-teds/pull/205 + +* Tue Oct 1 2024 Remi Collet <remi@remirepo.net> - 1.3.0-3 +- add patch for test suite with PHP 8.4 from + https://github.com/TysonAndre/pecl-teds/pull/205 + * Mon Sep 4 2023 Remi Collet <remi@remirepo.net> - 1.3.0-2 - build out of sources tree - add patch for test suite with PHP 8.3 from |