From 7b0768d2bbd8804414122567e941e9186e4d692d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Sep 2014 07:49:38 +0200 Subject: php-pecl-pthreads: 2.0.8 --- php-pecl-pthreads.spec | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'php-pecl-pthreads.spec') diff --git a/php-pecl-pthreads.spec b/php-pecl-pthreads.spec index 99fb02b..9c417cf 100644 --- a/php-pecl-pthreads.spec +++ b/php-pecl-pthreads.spec @@ -20,7 +20,7 @@ Summary: Threading API Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 2.0.7 +Version: 2.0.8 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages @@ -41,16 +41,19 @@ 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 "%{?vendor}" == "Remi Collet" +%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} -Obsoletes: php53u-pecl-%{pecl_name} -Obsoletes: php54-pecl-%{pecl_name} +Obsoletes: php53-pecl-%{pecl_name} <= %{version} +Obsoletes: php53u-pecl-%{pecl_name} <= %{version} +Obsoletes: php54-pecl-%{pecl_name} <= %{version} +Obsoletes: php54w-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} +Obsoletes: php55u-pecl-%{pecl_name} <= %{version} +Obsoletes: php55w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} +Obsoletes: php56u-pecl-%{pecl_name} <= %{version} +Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -66,12 +69,16 @@ A compatible Threading API for PHP5.3+ This extension is only available for PHP in ZTS mode. +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection}. + %prep %setup -q -c +# Don't install/register tests +sed -e 's/role="test"/role="src"/' -i package.xml + cd %{pecl_name}-%{version} -sed -e '/PHP_PTHREADS_VERSION/s/2.0.8/%{version}/' -i php_pthreads.h # Sanity check, really often broken extver=$(sed -n '/#define PHP_PTHREADS_VERSION/{s/.* "//;s/".*$//;p}' php_pthreads.h) @@ -108,12 +115,8 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} # Install XML package description install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml -# Test & Documentation +# Documentation cd %{pecl_name}-%{version} -for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') -do sed -e 's/\r//' -i $i - install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i -done for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') do sed -e 's/\r//' -i $i install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i @@ -152,8 +155,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) +%{?_licensedir:%license %{pecl_name}-%{version}/LICENSE} %doc %{pecl_docdir}/%{pecl_name} -%doc %{pecl_testdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_ztsinidir}/%{ini_name} @@ -161,6 +164,9 @@ rm -rf %{buildroot} %changelog +* Mon Sep 15 2014 Remi Collet - 2.0.8-1 +- Update to 2.0.8 + * Sun May 11 2014 Remi Collet - 2.0.7-1 - Update to 2.0.7 (stable) -- cgit