From 44cb0857fdadb198d1af67229518b73931611280 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Mar 2017 08:40:13 +0100 Subject: php-pecl-swoole: 1.9.7 (but waiting for 1.9.8 --- php-pecl-swoole.spec | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/php-pecl-swoole.spec b/php-pecl-swoole.spec index 16e2554..6116ec0 100644 --- a/php-pecl-swoole.spec +++ b/php-pecl-swoole.spec @@ -37,13 +37,16 @@ Summary: PHP's asynchronous concurrent distributed networking framework Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.9.6 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.9.7 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: %{pecl_name}-pr1148.patch +Patch1: 9aade9eafcd0d5be04366ed7b0f42e0dd0694082.patch + BuildRequires: %{?scl_prefix}php-devel >= 5.3.10 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-sockets @@ -141,9 +144,8 @@ sed -e 's/role="test"/role="src"/' \ cd NTS -%if 0%{?fedora} >= 26 -sed -e 's/SSL_library_init/OPENSSL_init_ssl/' -i config.m4 -%endif +%patch0 -p1 -b .pr1148 +%patch1 -p1 -b .upstream # Sanity check, really often broken extver=$(sed -n '/#define PHP_SWOOLE_VERSION/{s/.* "//;s/".*$//;p}' php_swoole.h) @@ -289,6 +291,15 @@ cd ../ZTS %changelog +* Thu Mar 16 2017 Remi Collet - 1.9.7-1 +- Update to 1.9.7 +- open https://github.com/swoole/swoole-src/issues/1147 + Missing files in archive +- add upstream patch for OpenSSL (EL-6 and EL-7) from + https://github.com/swoole/swoole-src/issues/1149 +- add patch for ZTS build from + https://github.com/swoole/swoole-src/pull/1148 + * Mon Mar 6 2017 Remi Collet - 1.9.6-2 - fix F26 build - open https://github.com/swoole/swoole-src/issues/1118 -- cgit