From 2f3701e825ead270d613bbc28697d90f3f5274da Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 21 Aug 2024 08:03:38 +0200 Subject: test build for PR 65 --- php-pecl-phpy.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'php-pecl-phpy.spec') diff --git a/php-pecl-phpy.spec b/php-pecl-phpy.spec index 9be4941..f5d13c2 100644 --- a/php-pecl-phpy.spec +++ b/php-pecl-phpy.spec @@ -22,12 +22,13 @@ Summary: An extension for inter-calling Python and PHP Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.0.6 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz Source1: https://github.com/swoole/phpy/blob/%{version}/LICENSE +Source2: config.m4 Patch0: 61.patch Patch1: 64.patch @@ -35,15 +36,7 @@ BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 8.1 BuildRequires: %{?scl_prefix}php-pear -# See https://github.com/swoole/phpy/issues/63 -%if 0%{?rhel} == 8 -# Retirement date: May 2029 (Full Life) -BuildRequires: python3.12-devel >= 3.8 -%global __usepyconf python3.12-config -%else -BuildRequires: python3-devel >= 3.8 -%global __usepyconf python3-config -%endif +BuildRequires: python3-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -81,6 +74,9 @@ sed -s '/-Wall/d' -i config.m4 # See https://github.com/swoole/phpy/pull/64 %patch -P1 -p1 -b .pr64 +# See https://github.com/swoole/phpy/pull/65 +cp %{SOURCE2} . + # See https://github.com/swoole/phpy/pull/62 cp %{SOURCE1} . @@ -113,7 +109,6 @@ cd %{sources} cd ../NTS %configure \ --enable-phpy \ - --with-python-config=%{_root_bindir}/%{__usepyconf} \ --with-libdir=%{_lib} \ --with-php-config=%{__phpconfig} make %{?_smp_mflags} @@ -122,7 +117,6 @@ make %{?_smp_mflags} cd ../ZTS %configure \ --enable-phpy \ - --with-python-config=%{_root_bindir}/%{__usepyconf} \ --with-libdir=%{_lib} \ --with-php-config=%{__ztsphpconfig} make %{?_smp_mflags} @@ -185,6 +179,9 @@ cd %{sources} %changelog +* Wed Aug 21 2024 Remi Collet - 1.0.6-3 +- test build for PR 65 + * Tue Aug 20 2024 Remi Collet - 1.0.6-2 - use python3.12 on EL-8 - open https://github.com/swoole/phpy/pull/65 use PKG_CHECK_MODULES -- cgit