diff options
| -rw-r--r-- | php-pecl-raphf-dev.spec | 21 | ||||
| -rw-r--r-- | php-pecl-raphf.spec | 39 |
2 files changed, 50 insertions, 10 deletions
diff --git a/php-pecl-raphf-dev.spec b/php-pecl-raphf-dev.spec index 03377a7..3a6d6f7 100644 --- a/php-pecl-raphf-dev.spec +++ b/php-pecl-raphf-dev.spec @@ -1,4 +1,7 @@ -# spec file for php-pecl-raphf +# remirepo spec file for php-pecl-raphf +# with SCL stuff, from: +# +# Fedora spec file for php-pecl-raphf # # Copyright (c) 2013-2015 Remi Collet # License: CC-BY-SA @@ -6,6 +9,14 @@ # # Please, preserve the changelog entries # +%if 0%{?scl:1} +%if "%{scl}" == "rh-php56" +%global sub_prefix more-php56- +%else +%global sub_prefix %{scl_prefix} +%endif +%endif + %{?scl: %scl_package php-pecl-raphf} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %{!?php_incldir: %global php_incldir %{_includedir}/php} @@ -79,7 +90,7 @@ Obsoletes: php56w-pecl-%{pecl_name} A reusable split-off of pecl_http's persistent handle and resource factory API. -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})}. %package devel @@ -164,6 +175,12 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done +# 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 diff --git a/php-pecl-raphf.spec b/php-pecl-raphf.spec index 5953c40..8de1f94 100644 --- a/php-pecl-raphf.spec +++ b/php-pecl-raphf.spec @@ -1,4 +1,7 @@ -# spec file for php-pecl-raphf +# remirepo spec file for php-pecl-raphf +# with SCL stuff, from: +# +# Fedora spec file for php-pecl-raphf # # Copyright (c) 2013-2015 Remi Collet # License: CC-BY-SA @@ -6,6 +9,14 @@ # # Please, preserve the changelog entries # +%if 0%{?scl:1} +%if "%{scl}" == "rh-php56" +%global sub_prefix more-php56- +%else +%global sub_prefix %{scl_prefix} +%endif +%endif + %{?scl: %scl_package php-pecl-raphf} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %{!?php_incldir: %global php_incldir %{_includedir}/php} @@ -24,9 +35,9 @@ %endif Summary: Resource and persistent handles factory -Name: %{?scl_prefix}php-pecl-%{pecl_name} +Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.0.4 -Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}.1 +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} @@ -39,8 +50,6 @@ BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-pecl-http >= 2.0.0 %endif -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}} @@ -77,6 +86,8 @@ Obsoletes: php56w-pecl-%{pecl_name} A reusable split-off of pecl_http's persistent handle and resource factory API. +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl})}. + %package devel Summary: %{name} developer files (header) @@ -160,12 +171,20 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%post -%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : +# 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 @@ -237,6 +256,10 @@ rm -rf %{buildroot} %changelog +* Sun Jun 21 2015 Remi Collet <remi@fedoraproject.org> - 1.0.4-5 +- allow build against rh-php56 (as more-php56) +- drop runtime dependency on pear, new scriptlets + * Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-4.1 - Fedora 21 SCL mass rebuild |