From 47b4d6bbe0c554a9bdc2ea0785fe01cd5a1874cc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Mar 2016 10:14:02 +0100 Subject: php-pecl-ev: F24 --- php-pecl-ev.spec | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/php-pecl-ev.spec b/php-pecl-ev.spec index 354e1af..d148741 100644 --- a/php-pecl-ev.spec +++ b/php-pecl-ev.spec @@ -7,9 +7,6 @@ # Please, preserve the changelog entries # %{?scl: %scl_package php-pecl-ev} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} # # NOTE: bundled libev @@ -30,7 +27,7 @@ Summary: Provides interface to libev library Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 0.2.15 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -48,10 +45,12 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-sockets%{?_isa} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +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} +Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff @@ -92,7 +91,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{pecl_name}-%{version} NTS # Don't register test files on install -sed -e '/role="test"/d' -i package.xml +sed -e 's/role="test"/role="src"/' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -i package.xml cd NTS # Sanity check, really often broken @@ -159,6 +160,7 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -175,6 +177,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -234,6 +237,9 @@ rm -rf %{buildroot} %changelog +* Tue Mar 8 2016 Remi Collet - 0.2.15-2 +- adapt for F24 + * Mon May 04 2015 Remi Collet - 0.2.15-1 - Update to 0.2.15 (stable, no change) - drop runtime dependency on pear, new scriptlets @@ -253,4 +259,5 @@ rm -rf %{buildroot} - enable ZTS build * Mon Sep 8 2014 Remi Collet - 0.2.11-1 -- initial package, version 0.2.11 (stable) \ No newline at end of file +- initial package, version 0.2.11 (stable) + -- cgit