diff options
| author | Remi Collet <remi@remirepo.net> | 2025-02-26 09:55:40 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-02-26 09:55:40 +0100 |
| commit | d1ee383f33e503e3110a4e43848d694de74d82c3 (patch) | |
| tree | 11443de0c9f9bafef5080c4b7ba67535f8f5b9c3 | |
| parent | e94c92f1d06d713baecbf5230a0f30b371c4b3c9 (diff) | |
re-license spec file to CECILL-2.1
| -rw-r--r-- | PHPINFO | 4 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-phpy.spec | 25 | ||||
| -rw-r--r-- | phpy-pkgconfig.patch | 2 |
4 files changed, 19 insertions, 14 deletions
@@ -5,5 +5,5 @@ phpy support => enabled Copyright => 上海识沃网络科技有限公司 Email => service@swoole.com Website => https://www.swoole.com/ -Extension Version => 1.0.8 -Python Version => 3.12.5 (main, Aug 7 2024, 00:00:00) [GCC 13.3.1 20240522 (Red Hat 13.3.1-1)] +Extension Version => 1.0.10 +Python Version => 3.13.2 (main, Feb 4 2025, 00:00:00) [GCC 14.2.1 20250110 (Red Hat 14.2.1-7)] @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #88 phpy version 1.0.8 ] { +Extension [ <persistent> extension #97 phpy version 1.0.10 ] { - Classes [13] { Class [ <internal:phpy> class PyCore ] { diff --git a/php-pecl-phpy.spec b/php-pecl-phpy.spec index 3f00af4..64b5004 100644 --- a/php-pecl-phpy.spec +++ b/php-pecl-phpy.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-phpy # -# Copyright (c) 2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2024-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,7 +17,7 @@ Summary: An extension for inter-calling Python and PHP Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.0.8 +Version: 1.0.10 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} @@ -89,13 +89,15 @@ EOF cd %{sources} %{__phpize} +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global cd ../NTS %configure \ --enable-phpy \ --with-libdir=%{_lib} \ --with-php-config=%{__phpconfig} -make %{?_smp_mflags} + +%make_build %if %{with_zts} cd ../ZTS @@ -103,15 +105,15 @@ cd ../ZTS --enable-phpy \ --with-libdir=%{_lib} \ --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} + +%make_build %endif %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} @@ -120,8 +122,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 @@ -163,6 +164,10 @@ cd %{sources} %changelog +* Wed Feb 26 2025 Remi Collet <remi@remirepo.net> - 1.0.10-1 +- update to 1.0.10 +- re-license spec file to CECILL-2.1 + * Fri Sep 6 2024 Remi Collet <remi@remirepo.net> - 1.0.8-1 - update to 1.0.8 - drop patches merged upstream diff --git a/phpy-pkgconfig.patch b/phpy-pkgconfig.patch index 2c9e7a3..25f2772 100644 --- a/phpy-pkgconfig.patch +++ b/phpy-pkgconfig.patch @@ -1,7 +1,7 @@ diff -up phpy-1.0.8/config.m4.old phpy-1.0.8/config.m4 --- phpy-1.0.8/config.m4.old 2024-09-06 06:58:54.678666785 +0200 +++ phpy-1.0.8/config.m4 2024-09-06 06:59:02.749976475 +0200 -@@ -68,9 +68,12 @@ if test "$PHP_PHPY" != "no"; then +@@ -70,9 +70,12 @@ if test "$PHP_PHPY" != "no"; then PHP_EVAL_LIBLINE($PYTHON_LIBS, PHPY_SHARED_LIBADD) PHP_EVAL_INCLINE($PYTHON_CFLAGS) else |