diff options
| author | Remi Collet <remi@remirepo.net> | 2024-09-06 07:17:30 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-09-06 07:17:30 +0200 |
| commit | e94c92f1d06d713baecbf5230a0f30b371c4b3c9 (patch) | |
| tree | c89c6b96ad3538ef2c86766a66decc8c59a8c794 /php-pecl-phpy.spec | |
| parent | 2f3701e825ead270d613bbc28697d90f3f5274da (diff) | |
drop patches merged upstream
add patch to use pkg-config by default
Diffstat (limited to 'php-pecl-phpy.spec')
| -rw-r--r-- | php-pecl-phpy.spec | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/php-pecl-phpy.spec b/php-pecl-phpy.spec index f5d13c2..3f00af4 100644 --- a/php-pecl-phpy.spec +++ b/php-pecl-phpy.spec @@ -6,11 +6,7 @@ # # Please, preserve the changelog entries # -%if 0%{?scl:1} -%scl_package php-pecl-phpy -%else -%global _root_bindir %{_bindir} -%endif +%{?scl:%scl_package php-pecl-phpy} %global pecl_name phpy %global ini_name 40-%{pecl_name}.ini @@ -21,16 +17,15 @@ Summary: An extension for inter-calling Python and PHP Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.0.6 -Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 1.0.8 +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} 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 +# Always use pkg-config instead of python3-config +# see https://github.com/swoole/phpy/pull/65 +Patch0: %{pecl_name}-pkgconfig.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -60,7 +55,6 @@ 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"/' \ - -e '/README/s/role="src"/role="doc"/' \ -e '/LICENSE/s/role="doc"/role="src"/' \ -i package.xml @@ -68,17 +62,7 @@ cd %{sources} # drop unneeded options (keep std=c++14) sed -s '/-Wall/d' -i config.m4 -# See https://github.com/swoole/phpy/pull/61 -%patch -P0 -p1 -b .pr61 - -# 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} . +%patch -P0 -p1 -b .pkg # Sanity check, really often broken extver=$(sed -n '/# define PHP_PHPY_VERSION/{s/.* "//;s/".*$//;p}' php_phpy.h) @@ -179,6 +163,11 @@ cd %{sources} %changelog +* Fri Sep 6 2024 Remi Collet <remi@remirepo.net> - 1.0.8-1 +- update to 1.0.8 +- drop patches merged upstream +- add patch to use pkg-config by default + * Wed Aug 21 2024 Remi Collet <remi@remirepo.net> - 1.0.6-3 - test build for PR 65 |