From 0e0003daab986f76a441ed9602e159e87d90055d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Mar 2016 13:52:24 +0100 Subject: php-pecl-ircclient: F24 --- php-pecl-ircclient.spec | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/php-pecl-ircclient.spec b/php-pecl-ircclient.spec index e7c826d..ea8b643 100644 --- a/php-pecl-ircclient.spec +++ b/php-pecl-ircclient.spec @@ -7,9 +7,6 @@ # Please, preserve the changelog entries # %{?scl: %scl_package php-pecl-ircclient} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global with_zts 0%{?__ztsphp:1} %global pecl_name ircclient @@ -22,7 +19,7 @@ Summary: IRC Client Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 0.3.0 -Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -41,10 +38,12 @@ 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} +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 @@ -72,11 +71,15 @@ Obsoletes: php56w-pecl-%{pecl_name} %description Binding for the ircclient library. +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. + %prep %setup -q -c mv %{pecl_name}-%{version} NTS +%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} + cd NTS %patch0 -p1 -b .upstream cd .. @@ -134,6 +137,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 @@ -150,6 +154,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -174,6 +179,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) +%{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -187,6 +193,10 @@ rm -rf %{buildroot} %changelog +* Tue Mar 8 2016 Remi Collet - 0.3.0-5 +- adapt for F24 +- fix license management + * Tue Jun 2 2015 Remi Collet - 0.3.0-4 - drop runtime dependency on pear, new scriptlets - rebuild for libircclient in EPEL @@ -203,4 +213,5 @@ rm -rf %{buildroot} * Fri Jan 10 2014 Remi Collet - 0.3.0-1 - initial package, version 0.3.0 (beta) - open https://bitbucket.org/mike_php_net/ext-ircclient/pull-request/2 -- open https://bitbucket.org/mike_php_net/ext-ircclient/pull-request/1 \ No newline at end of file +- open https://bitbucket.org/mike_php_net/ext-ircclient/pull-request/1 + -- cgit