From 10ce346530a757323bd9ea0aeae3cac1de5cd960 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 31 Aug 2018 14:02:25 +0200
Subject: v4.1.0

---
 php-pecl-swoole4.spec | 43 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

(limited to 'php-pecl-swoole4.spec')

diff --git a/php-pecl-swoole4.spec b/php-pecl-swoole4.spec
index 0555a2c..2ceed15 100644
--- a/php-pecl-swoole4.spec
+++ b/php-pecl-swoole4.spec
@@ -12,7 +12,7 @@
 
 %if 0%{?scl:1}
 %global sub_prefix %{scl_prefix}
-%scl_package       php-pecl-swoole
+%scl_package       php-pecl-swoole4
 %endif
 
 %global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
@@ -27,17 +27,32 @@
 %endif
 %global with_nghttpd2 1
 %global with_hiredis  1
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
+%global with_brotli   1
+%else
+%global with_brotli   0
+%endif
+
 
 Summary:        PHP's asynchronous concurrent distributed networking framework
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}4
-Version:        4.0.4
-Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        4.1.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
 
+Source1:        https://raw.githubusercontent.com/swoole/swoole-src/master/include/socket.h
+Source2:        https://raw.githubusercontent.com/swoole/swoole-src/master/include/channel.h
+Source3:        https://raw.githubusercontent.com/swoole/swoole-src/master/src/coroutine/socket.cc
+Source4:        https://raw.githubusercontent.com/swoole/swoole-src/master/src/coroutine/channel.cc
+
+%if 0%{?rhel} == 6
+BuildRequires:  devtoolset-6-toolchain
+%else
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?dtsprefix}gcc-c++
+%endif
 BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-sockets
@@ -53,6 +68,9 @@ BuildRequires:  postgresql-devel > 9.5
 %if %{with_hiredis}
 BuildRequires:  hiredis-devel
 %endif
+%if %{with_brotli}
+BuildRequires:  brotli-devel
+%endif
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
@@ -152,6 +170,9 @@ sed -e '/examples/s/role="src"/role="doc"/' \
 
 
 cd NTS
+cp %{SOURCE1} %{SOURCE2} include/
+cp %{SOURCE3} %{SOURCE4} src/coroutine/
+
 # 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
@@ -171,6 +192,7 @@ cat << 'EOF' | tee %{ini_name}
 extension=%{pecl_name}.so
 
 ; Configuration
+;swoole.enable_coroutine = On
 ;swoole.aio_thread_num = 2
 ;swoole.display_errors = On
 ;swoole.use_namespace = On
@@ -181,7 +203,12 @@ EOF
 
 
 %build
+%if 0%{?rhel} == 6
+source /opt/rh/devtoolset-6/enable
+g++ --version
+%else
 %{?dtsenable}
+%endif
 
 peclbuild() {
 %configure \
@@ -218,7 +245,12 @@ peclbuild %{_bindir}/zts-php-config
 
 
 %install
+%if 0%{?rhel} == 6
+source /opt/rh/devtoolset-6/enable
+g++ --version
+%else
 %{?dtsenable}
+%endif
 
 make -C NTS \
      install INSTALL_ROOT=%{buildroot}
@@ -312,6 +344,11 @@ cd ../ZTS
 
 
 %changelog
+* Fri Aug 31 2018 Remi Collet <remi@remirepo.net> - 4.1.0-1
+- update to 4.1.0
+- add dependency on brotli library (Fedora)
+- open https://github.com/swoole/swoole-src/issues/1931 missing files
+
 * Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 4.0.4-2
 - rebuild for 7.3.0beta2 new ABI
 
-- 
cgit