From ba8d3b47c89086a1b2b69b7b49e4274471d6a6ec Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Mar 2015 09:23:43 +0100 Subject: php-pecl-apfd: cleanup for review --- php-pecl-apfd.spec | 65 ++++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 44 deletions(-) (limited to 'php-pecl-apfd.spec') diff --git a/php-pecl-apfd.spec b/php-pecl-apfd.spec index c33a51f..1a80621 100644 --- a/php-pecl-apfd.spec +++ b/php-pecl-apfd.spec @@ -6,7 +6,6 @@ # # Please, preserve the changelog entries # -%{?scl: %scl_package php-pecl-apfd} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %{!?__pecl: %global __pecl %{_bindir}/pecl} %{!?__php: %global __php %{_bindir}/php} @@ -22,44 +21,29 @@ #global prever RC1 Summary: Always Populate Form Data -Name: %{?scl_prefix}php-pecl-%{pecl_name} +Name: php-pecl-%{pecl_name} Version: 1.0.0 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel > 5.3 -BuildRequires: %{?scl_prefix}php-pear - -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(%{pecl_name})%{?_isa} = %{version} +BuildRequires: php-devel > 5.3 +BuildRequires: php-pear + +Requires(post): %{__pecl} +Requires(postun): %{__pecl} +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} + +Provides: php-%{pecl_name} = %{version} +Provides: php-%{pecl_name}%{?_isa} = %{version} +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} # Split off pecl/http -Conflicts: %{?scl_prefix}php-pecl(http) < 2.4 - -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -%endif -%endif +Conflicts: php-pecl(http) < 2.4 %if 0%{?fedora} < 20 && 0%{?rhel} < 7 # Filter shared private @@ -75,8 +59,6 @@ handler, like "json_post") without regard to the request's request method. This extension does not provide any INI entries, constants, functions or classes. -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection}. - %prep %setup -q -c @@ -147,20 +129,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 +%post +%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -# 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 -a -x %{__pecl} ] ; then +if [ $1 -eq 0 ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi @@ -214,6 +188,9 @@ rm -rf %{buildroot} %changelog +* Wed Mar 18 2015 Remi Collet - 1.0.0-2 +- cleanup SCL stuff for review + * Wed Mar 18 2015 Remi Collet - 1.0.0-1 - Update to 1.0.0 -- cgit