From 1783878962453c223696efc784597e255762e5ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Mar 2016 07:32:48 +0100 Subject: php-pecl-seaslog: F24 --- php-pecl-seaslog.spec | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'php-pecl-seaslog.spec') diff --git a/php-pecl-seaslog.spec b/php-pecl-seaslog.spec index ab43439..4020790 100644 --- a/php-pecl-seaslog.spec +++ b/php-pecl-seaslog.spec @@ -16,9 +16,6 @@ %{?scl: %scl_package php-pecl-seaslog} %{!?scl: %global _root_libdir %{_libdir}} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global proj_name SeasLog @@ -33,7 +30,7 @@ Summary: A effective,fast,stable log extension for PHP Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.5.0 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: ASL 2.0 Group: Development/Languages URL: http://pecl.php.net/package/%{proj_name} @@ -47,10 +44,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(%{proj_name}) = %{version} +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(%{proj_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{proj_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 @@ -96,7 +95,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{proj_name}-%{version} NTS # Don't install tests -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 @@ -191,6 +192,7 @@ cd ../ZTS %endif +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -207,6 +209,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{proj_name} >/dev/null || : fi +%endif %clean @@ -229,6 +232,9 @@ rm -rf %{buildroot} %changelog +* Sun Mar 6 2016 Remi Collet - 1.5.0-2 +- adapt for F24 + * Sun Dec 06 2015 Remi Collet - 1.5.0-1 - Update to 1.5.0 @@ -245,4 +251,4 @@ rm -rf %{buildroot} - Update to 1.4.2 (stable) * Mon Sep 14 2015 Remi Collet - 1.4.0-1 -- initial package, version 1.4.0 (stable) \ No newline at end of file +- initial package, version 1.4.0 (stable) -- cgit