summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-phpy.spec60
3 files changed, 29 insertions, 35 deletions
diff --git a/PHPINFO b/PHPINFO
index fb7aee5..e67e37f 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -6,4 +6,4 @@ Copyright => 上海识沃网络科技有限公司
Email => service@swoole.com
Website => https://www.swoole.com/
Extension Version => 1.0.11
-Python Version => 3.13.2 (main, Feb 4 2025, 00:00:00) [GCC 14.2.1 20250110 (Red Hat 14.2.1-7)]
+Python Version => 3.14.4 (main, Apr 8 2026, 00:00:00) [GCC 15.2.1 20260123 (Red Hat 15.2.1-7)]
diff --git a/REFLECTION b/REFLECTION
index 685431b..382cf57 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #98 phpy version 1.0.11 ] {
+Extension [ <persistent> extension #110 phpy version 1.0.11 ] {
- Classes [13] {
Class [ <internal:phpy> class PyCore ] {
diff --git a/php-pecl-phpy.spec b/php-pecl-phpy.spec
index cddcb3f..8ed6b48 100644
--- a/php-pecl-phpy.spec
+++ b/php-pecl-phpy.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pecl-phpy
#
-# SPDX-FileCopyrightText: Copyright 2024-2025 Remi Collet
+# SPDX-FileCopyrightText: Copyright 2024-2026 Remi Collet
# SPDX-License-Identifier: CECILL-2.1
# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
@@ -11,17 +11,23 @@
%global pecl_name phpy
%global ini_name 40-%{pecl_name}.ini
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
-%global sources %{pecl_name}-%{version}
-%global _configure ../%{sources}/configure
+%global _configure ../configure
+
+# Github forge
+%global gh_vend swoole
+%global gh_proj %{pecl_name}
+%global forgeurl https://github.com/%{gh_vend}/%{gh_proj}
+%global tag %{version}
-Summary: An extension for inter-calling Python and PHP
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 1.0.11
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Summary: An extension for inter-calling Python and PHP
License: Apache-2.0
-URL: https://pecl.php.net/package/%{pecl_name}
-Source0: https://pecl.php.net/get/%{sources}.tgz
+Version: 1.0.11
+Release: 2%{?dist}
+%forgemeta
+URL: %{forgeurl}
+Source0: %{forgesource}
# Always use pkg-config instead of python3-config
# see https://github.com/swoole/phpy/pull/65
@@ -30,16 +36,18 @@ Patch0: %{pecl_name}-pkgconfig.patch
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 8.1
-BuildRequires: %{?scl_prefix}php-pear
BuildRequires: python3-devel
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
+# 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}
+# No PIE for now
%description
@@ -51,26 +59,20 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%prep
-%setup -q -c
-
-# Don't install/register tests
-sed -e 's/role="test"/role="src"/' \
- -e '/LICENSE/s/role="doc"/role="src"/' \
- -i package.xml
+%forgesetup
-cd %{sources}
-# drop unneeded options (keep std=c++14)
sed -s '/-Wall/d' -i config.m4
%patch -P0 -p1 -b .pkg
+sed -e '/PHP_PHPY_VERSION/s/1.0.10/%{version}/' -i php_phpy.h
+
# Sanity check, really often broken
extver=$(sed -n '/# define PHP_PHPY_VERSION/{s/.* "//;s/".*$//;p}' php_phpy.h)
if test "x${extver}" != "x%{version}"; then
: Error: Upstream extension version is ${extver}, expecting %{version}.
exit 1
fi
-cd ..
mkdir NTS
%if %{with_zts}
@@ -87,11 +89,10 @@ EOF
%build
%{?dtsenable}
-cd %{sources}
%{__phpize}
sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global
-cd ../NTS
+cd NTS
%configure \
--enable-phpy \
--with-libdir=%{_lib} \
@@ -118,24 +119,14 @@ cd ../ZTS
# install config file
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-# Install XML package description
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
%if %{with_zts}
%make_install -C ZTS
install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
-# Documentation
-for i in LICENSE $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
-
%check
-cd %{sources}
-
# Minimal load test for NTS extension
%{__php} --no-php-ini \
--define extension=%{buildroot}/%{php_extdir}/%{pecl_name}.so \
@@ -150,9 +141,8 @@ cd %{sources}
%files
-%license %{sources}/LICENSE
-%doc %{pecl_docdir}/%{pecl_name}
-%{pecl_xmldir}/%{name}.xml
+%license LICENSE
+%doc README.md
%config(noreplace) %{php_inidir}/%{ini_name}
%{php_extdir}/%{pecl_name}.so
@@ -164,6 +154,10 @@ cd %{sources}
%changelog
+* Thu Apr 23 2026 Remi Collet <remi@remirepo.net> - 1.0.11-2
+- drop pear/pecl dependency
+- sources from github
+
* Thu Mar 6 2025 Remi Collet <remi@remirepo.net> - 1.0.11-1
- update to 1.0.11