diff options
| author | Remi Collet <remi@remirepo.net> | 2025-08-04 07:46:24 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-08-04 07:46:24 +0200 |
| commit | 428dbb25fd082fa266421eb2a5b1702a426b89c7 (patch) | |
| tree | c55ac6d4e87b5c2ab70c6275f4d4fbce0506fec7 /php-pecl-swoole5.spec | |
| parent | 498321920ce54c8cb26135a1ed3ce8aeb070cbfd (diff) | |
drop patch merged upstream
Diffstat (limited to 'php-pecl-swoole5.spec')
| -rw-r--r-- | php-pecl-swoole5.spec | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/php-pecl-swoole5.spec b/php-pecl-swoole5.spec index a903998..521da3f 100644 --- a/php-pecl-swoole5.spec +++ b/php-pecl-swoole5.spec @@ -13,6 +13,8 @@ %global _root_prefix %{_prefix} %endif +%global pie_vend swoole +%global pie_proj swoole %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name swoole # After 20-sockets, 20-json and 20-mysqlnd @@ -39,7 +41,7 @@ %bcond_without curl %bcond_without nghttpd2 -%global upstream_version 5.1.7 +%global upstream_version 5.1.8 #global upstream_prever RC2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure @@ -55,9 +57,6 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -# Backported from version 6 -Patch0: 0001-fix-cpu-affinity-check.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -107,10 +106,12 @@ Requires: %{?scl_prefix}php-sockets%{?_isa} Requires: %{?scl_prefix}php-mysqlnd%{?_isa} Requires: %{?scl_prefix}php-pdo%{?_isa} -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} %if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 || "%{php_version}" >= "8.2" Obsoletes: %{?scl_prefix}php-pecl-%{pecl_name} < 5 @@ -185,8 +186,6 @@ rm -r thirdparty/nghttp2 cp -p thirdparty/nghttp2/COPYING nghttp2-COPYING %endif -%patch -P0 -p1 - # Sanity check, really often broken extver=$(sed -n '/#define SWOOLE_VERSION /{s/.* "//;s/".*$//;p}' include/swoole_version.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -354,6 +353,10 @@ cd ../ZTS %changelog +* Mon Aug 4 2025 Remi Collet <remi@remirepo.net> - 5.1.8-1 +- update to 5.1.8 +- drop patch merged upstream + * Sun Feb 16 2025 Remi Collet <remi@remirepo.net> - 5.1.7-1 - update to 5.1.7 - re-license spec file to CECILL-2.1 |