From b1ef54e0a932bc65893fb7a29953c1dd7a567165 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 21 Apr 2017 08:23:05 +0200
Subject: v1.9.9

---
 php-pecl-swoole.spec | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

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

diff --git a/php-pecl-swoole.spec b/php-pecl-swoole.spec
index 7dc9566..91d383e 100644
--- a/php-pecl-swoole.spec
+++ b/php-pecl-swoole.spec
@@ -27,23 +27,20 @@
 %global with_mysqlnd 0
 %endif
 
-
-%if 0%{?fedora} >= 22 || 0%{?rhel} >= 6
 %global with_nghttpd2 1
-%else
-%global with_nghttpd2 0
-%endif
 %global with_hiredis  1
 
 Summary:        PHP's asynchronous concurrent distributed networking framework
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        1.9.8
+Version:        1.9.9
 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:         07c762243598947e932502e92674df7fc6d01204.patch
+
 BuildRequires:  %{?scl_prefix}php-devel >= 5.3.10
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-sockets
@@ -129,6 +126,20 @@ Documentation: https://rawgit.com/tchiotludo/swoole-ide-helper/english/docs/
 Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
 
 
+%package devel
+Summary:       %{name} developer files (header)
+Group:         Development/Libraries
+Requires:      %{name}%{?_isa} = %{version}-%{release}
+Requires:      %{?scl_prefix}php-devel%{?_isa}
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
+Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel = %{version}-%{release}
+Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel%{?_isa} = %{version}-%{release}
+%endif
+
+%description devel
+These are the files needed to compile programs using %{name}.
+
+
 %prep
 %setup -q -c
 mv %{pecl_name}-%{version} NTS
@@ -141,6 +152,8 @@ sed -e 's/role="test"/role="src"/' \
 
 
 cd NTS
+%patch0 -p1 -b .upstream
+
 # 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
@@ -165,6 +178,7 @@ extension=%{pecl_name}.so
 ;swoole.use_namespace = Off
 ;swoole.fast_serialize = Off
 ;swoole.unixsock_buffer_size = 8388608
+;swoole.modules = ''
 EOF
 
 
@@ -283,8 +297,22 @@ cd ../ZTS
 %{php_ztsextdir}/%{pecl_name}.so
 %endif
 
+%files devel
+%{php_incldir}/ext/%{pecl_name}
+
+%if %{with_zts}
+%{php_ztsincldir}/ext/%{pecl_name}
+%endif
+
+
 
 %changelog
+* Fri Apr 21 2017 Remi Collet <remi@remirepo.net> - 1.9.9-1
+- Update to 1.9.9
+- add upstream patch for broken build, see
+  https://github.com/swoole/swoole-src/issues/1194
+- add devel sub-package with extension headers
+
 * Thu Mar 16 2017 Remi Collet <remi@remirepo.net> - 1.9.8-1
 - Update to 1.9.8
 - drop patch merged upstream
-- 
cgit