From 5fd70c57090e9c9e55659aabee9f41e1fbf3e6f3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Aug 2017 12:45:09 +0200 Subject: v2.0.8 (beta) --- php-pecl-swoole2.spec | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 10 deletions(-) (limited to 'php-pecl-swoole2.spec') diff --git a/php-pecl-swoole2.spec b/php-pecl-swoole2.spec index 43c157d..472e1b7 100644 --- a/php-pecl-swoole2.spec +++ b/php-pecl-swoole2.spec @@ -30,8 +30,8 @@ Summary: PHP's asynchronous concurrent distributed networking framework Name: %{?sub_prefix}php-pecl-%{pecl_name}2 -Version: 2.0.7 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.0.8 +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} @@ -68,8 +68,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}2%{?_isa} = %{version}-%{rele # Single version can be installed Conflicts: %{?sub_prefix}php-pecl-%{pecl_name} < 2 Conflicts: %{?scl_prefix}php-pecl-%{pecl_name} < 2 -# Package have been renamed -Obsoletes: %{?sub_prefix}php-pecl-%{pecl_name} > 2 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff @@ -128,13 +126,26 @@ 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 # Don't install/register tests, install examples as doc -sed -e 's/role="test"/role="src"/' \ - -e '/examples/s/role="src"/role="doc"/' \ +sed -e '/examples/s/role="src"/role="doc"/' \ %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package.xml @@ -175,7 +186,6 @@ peclbuild() { %configure \ --with-swoole \ --enable-sockets \ - --enable-ringbuffer \ %if %{with_hiredis} --enable-async-redis \ %endif @@ -222,7 +232,10 @@ make -C ZTS \ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif -# Documentation +# Test and Documentation +for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//') +do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i +done for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -270,7 +283,9 @@ cd ../ZTS %files %{?_licensedir:%license NTS/LICENSE} -%doc %{pecl_docdir}/%{pecl_name} +%{!?_licensedir:%{pecl_docdir}/%{pecl_name}/LICENSE} +%doc %{pecl_docdir}/%{pecl_name}/*md +%doc %{pecl_docdir}/%{pecl_name}/CREDITS %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -282,7 +297,21 @@ cd ../ZTS %endif +%files devel +%doc %{pecl_testdir}/%{pecl_name} +%doc %{pecl_docdir}/%{pecl_name}/examples +%{php_incldir}/ext/%{pecl_name} + +%if %{with_zts} +%{php_ztsincldir}/ext/%{pecl_name} +%endif + + %changelog +* Fri Aug 4 2017 Remi Collet - 2.0.8-1 +- Update to 2.0.8 (beta) +- add devel sub-package + * Tue Jul 18 2017 Remi Collet - 2.0.7-3 - rebuild for PHP 7.2.0beta1 new API @@ -290,7 +319,7 @@ cd ../ZTS - fix release * Fri Mar 17 2017 Remi Collet - 2.0.7-1 -- Update to 2.0.7 +- Update to 2.0.7 (beta) - rename to php-pecl-swoole2 * Mon Mar 6 2017 Remi Collet - 2.0.6-3 -- cgit