From b4db0738d9da26a9bc92df3f372bf7f83b22f9de Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Mar 2016 08:00:55 +0100 Subject: php-pecl-trader: F24 --- php-pecl-trader.spec | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/php-pecl-trader.spec b/php-pecl-trader.spec index f092604..f7eb715 100644 --- a/php-pecl-trader.spec +++ b/php-pecl-trader.spec @@ -15,9 +15,6 @@ %endif %{?scl: %scl_package php-pecl-trader} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} #### TODO : bundle ta-lib @@ -33,7 +30,7 @@ Summary: Technical Analysis for traders Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 0.4.0 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} # PHP ext is BSD-2, ta-lib is BSD-3 License: BSD Group: Development/Languages @@ -48,13 +45,13 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %{?_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} # For morephp SCLs -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +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 @@ -100,6 +97,7 @@ mv %{pecl_name}-%{version} NTS # Don't install tests sed -e 's/role="test"/role="src"/' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package.xml cd NTS @@ -164,6 +162,7 @@ do install -Dpm 644 NTS/$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 @@ -180,6 +179,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -236,8 +236,12 @@ rm -rf %{buildroot} %changelog +* Sun Mar 6 2016 Remi Collet - 0.4.0-3 +- adapt for F24 + * Tue Nov 17 2015 Remi Collet - 0.4.0-2 - cleanup and build for PHP 7 * Mon Feb 16 2015 Remi Collet - 0.4.0-1 -- initial package, version 0.4.0 (stable) \ No newline at end of file +- initial package, version 0.4.0 (stable) + -- cgit