From 893b8eba991c0225cafe2d1eb674e1eb758739a0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 14 Jun 2018 11:53:59 +0200 Subject: update to 4.0.0 rename to php-pecl-swoole4 raise dependency on PHP 7.1 add patch to ensure g++ is used a linktime from https://github.com/swoole/swoole-src/pull/1717 --- php-pecl-swoole4.spec | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) (limited to 'php-pecl-swoole4.spec') diff --git a/php-pecl-swoole4.spec b/php-pecl-swoole4.spec index e132e14..aae12ca 100644 --- a/php-pecl-swoole4.spec +++ b/php-pecl-swoole4.spec @@ -1,4 +1,4 @@ -# remirepo spec file for php-pecl-swoole2 +# remirepo spec file for php-pecl-swoole4 # # Copyright (c) 2013-2018 Remi Collet # License: CC-BY-SA @@ -40,15 +40,18 @@ %global with_hiredis 1 Summary: PHP's asynchronous concurrent distributed networking framework -Name: %{?sub_prefix}php-pecl-%{pecl_name}2 -Version: 2.2.0 +Name: %{?sub_prefix}php-pecl-%{pecl_name}4 +Version: 4.0.0 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/swoole/swoole-src/pull/1717.patch + BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel > 7 +BuildRequires: %{?dtsprefix}gcc-c++ +BuildRequires: %{?scl_prefix}php-devel > 7.1 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-sockets BuildRequires: %{?scl_prefix}php-mysqlnd @@ -75,27 +78,22 @@ 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} %if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name}2 = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}2%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}4 = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}4%{?_isa} = %{version}-%{release} +Conflicts: %{?scl_prefix}php-pecl-%{pecl_name} < 2 +Conflicts: %{?scl_prefix}php-pecl-%{pecl_name}2 < 4 %endif # Single version can be installed -Conflicts: %{?sub_prefix}php-pecl-%{pecl_name} < 2 -Conflicts: %{?scl_prefix}php-pecl-%{pecl_name} < 2 +Conflicts: %{?sub_prefix}php-pecl-%{pecl_name} < 2 +Conflicts: %{?sub_prefix}php-pecl-%{pecl_name}2 < 4 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -Obsoletes: php56u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php56w-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php70u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php70w-pecl-%{pecl_name}2 <= %{version} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php71w-pecl-%{pecl_name}2 <= %{version} -%endif +Obsoletes: php71u-pecl-%{pecl_name}4 <= %{version} +Obsoletes: php71w-pecl-%{pecl_name}4 <= %{version} %if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php72w-pecl-%{pecl_name}2 <= %{version} +Obsoletes: php72u-pecl-%{pecl_name}4 <= %{version} +Obsoletes: php72w-pecl-%{pecl_name}4 <= %{version} %endif %endif @@ -154,6 +152,8 @@ sed -e '/examples/s/role="src"/role="doc"/' \ cd NTS +%patch0 -p1 -b .pr1717 + # Sanity check, really often broken extver=$(sed -n '/#define PHP_SWOOLE_VERSION/{s/.* "//;s/".*$//;p}' php_swoole.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then @@ -315,6 +315,13 @@ cd ../ZTS %changelog +* Thu Jun 14 2018 Remi Collet - 4.0.0-1 +- update to 4.0.0 +- rename to php-pecl-swoole4 +- raise dependency on PHP 7.1 +- add patch to ensure g++ is used a linktime from + https://github.com/swoole/swoole-src/pull/1717 + * Wed May 23 2018 Remi Collet - 2.2.0-1 - update to 2.2.0 -- cgit