From 20220d956dd8e738a94b882304c373b3e82e11cc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Mar 2016 10:40:57 +0100 Subject: php-pecl-xmp: F24 --- php-pecl-xmp.spec | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/php-pecl-xmp.spec b/php-pecl-xmp.spec index f86f6e1..6c320dc 100644 --- a/php-pecl-xmp.spec +++ b/php-pecl-xmp.spec @@ -7,13 +7,10 @@ # Please, preserve the changelog entries # %{?scl: %scl_package php-pecl-xmp} -%{!?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 xmp -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} +%global with_tests 0%{!?_without_tests:1} %if "%{php_version}" < "5.6" %global ini_name %{pecl_name}.ini %else @@ -23,7 +20,7 @@ Summary: Bindings for the libxmp library Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 4.2.0 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}.1 +Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: ASL 2.0 Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -34,16 +31,16 @@ BuildRequires: libxmp-devel BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear -Requires(post): %{__pecl} -Requires(postun): %{__pecl} 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,7 +69,7 @@ Obsoletes: php56w-pecl-%{pecl_name} <= %{version} PHP extension for managing (e.g. playing, decoding, retrieving metadata, mixing) module tracked files (http://en.wikipedia.org/wiki/Module_file). -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection}. +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 @@ -80,7 +77,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{pecl_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 # Sanity check, really often broken @@ -142,14 +141,24 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%post -%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : +%if 0%{?fedora} < 24 +# when pear installed alone, after us +%triggerin -- %{?scl_prefix}php-pear +if [ -x %{__pecl} ] ; then + %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : +fi +# posttrans as pear can be installed after us +%posttrans +if [ -x %{__pecl} ] ; then + %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : +fi %postun -if [ $1 -eq 0 ] ; then +if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -192,8 +201,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc %{pecl_docdir}/%{pecl_name} %{?_licensedir:%license NTS/LICENSE} +%doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -206,8 +215,12 @@ rm -rf %{buildroot} %changelog +* Wed Mar 9 2016 Remi Collet - 4.2.0-2 +- adapt for F24 +- drop runtime dependency on pear, new scriptlets + * Wed Dec 24 2014 Remi Collet - 4.2.0-1.1 - Fedora 21 SCL mass rebuild * Fri Sep 12 2014 Remi Collet - 4.2.0-1 -- initial package \ No newline at end of file +- initial package -- cgit