From d1b673ebef0886a6e2fffff2ba207e94a81ae3fe Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Feb 2016 11:21:04 +0100 Subject: [PATCH] drop scriptlets + cleanup --- php-pecl-http.spec | 61 +++++----------------------------------------- 1 file changed, 6 insertions(+), 55 deletions(-) diff --git a/php-pecl-http.spec b/php-pecl-http.spec index e6c6225..c2cee5f 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -6,22 +6,12 @@ # # Please, preserve the changelog entries # -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?php_incldir: %global php_incldir %{_includedir}/php} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} - # The project is pecl_http but the extension is only http %global proj_name pecl_http %global pecl_name http %global with_zts 0%{?__ztsphp:1} -%if "%{php_version}" < "5.6" -# after hash iconv propro raphf -%global ini_name z-%{pecl_name}.ini -%else # after 20-iconv 40-propro 40-raphf %global ini_name 50-%{pecl_name}.ini -%endif %ifarch %{arm} # Test suite disabled because of erratic results on slow ARM (timeout) %global with_tests 0%{?_with_tests:1} @@ -29,10 +19,9 @@ %global with_tests 0%{!?_without_tests:1} %endif -#global prever RC1 Name: php-pecl-http Version: 2.5.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extended HTTP support License: BSD @@ -57,33 +46,15 @@ BuildRequires: php-pecl-raphf-devel >= 1.1.0 BuildRequires: libevent-devel >= 1.4 BuildRequires: pkgconfig -Requires(post): %{__pecl} -Requires(postun): %{__pecl} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} -%if "%{php_version}" < "5.4" -# php 5.3.3 in EL-6 don't use arched virtual provides -# so only requires real packages instead -Requires: php-common%{?_isa} -%else Requires: php-hash%{?_isa} Requires: php-iconv%{?_isa} Requires: php-spl%{?_isa} -%endif Requires: php-pecl(propro)%{?_isa} >= 1.0.0 Requires: php-pecl(raphf)%{?_isa} >= 1.1.0 -%if 0%{?fedora} < 22 -# new extensions split off this one. -Requires: php-pecl(json_post)%{?_isa} -Requires: php-pecl(apfd)%{?_isa} -%endif -%if "%{php_version}" > "5.6" # V1 don't support PHP 5.6 https://bugs.php.net/66879 Obsoletes: php-pecl-http1 < 2 -%else -# Can't install both versions of the same extension -Conflicts: php-pecl-http1 -%endif Provides: php-pecl(%{proj_name}) = %{version}%{?prever} Provides: php-pecl(%{proj_name})%{?_isa} = %{version}%{?prever} @@ -92,12 +63,6 @@ Provides: php-pecl(%{pecl_name})%{?_isa} = %{version}%{?prever} Provides: php-%{pecl_name} = %{version}%{?prever} Provides: php-%{pecl_name}%{?_isa} = %{version}%{?prever} -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%endif -%{?filter_setup} - %description The HTTP extension aims to provide a convenient and powerful set of @@ -113,11 +78,7 @@ Also provided is a powerful request and parallel interface. Version 2 is completely incompatible to previous version. -Note: -. php-pecl-http1 provides API version 1 -. php-pecl-http provides API version 2 - -Documentation : http://devel-m6w6.rhcloud.com/mdref/http +Documentation : https://mdref.m6w6.name/http %package devel @@ -125,11 +86,7 @@ Summary: Extended HTTP support developer files (header) Group: Development/Libraries Requires: php-pecl-http%{?_isa} = %{version}-%{release} Requires: php-devel%{?_isa} >= 5.3.0 -%if "%{php_version}" > "5.6" Obsoletes: php-pecl-http1-devel < 2 -%else -Conflicts: php-pecl-http1-devel -%endif %description devel These are the files needed to compile programs using HTTP extension. @@ -256,16 +213,6 @@ NO_INTERACTION=1 \ %endif -%post -%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : - - -%postun -if [ $1 -eq 0 ] ; then - %{pecl_uninstall} %{proj_name} >/dev/null || : -fi - - %files %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{proj_name} @@ -288,6 +235,10 @@ fi %changelog +* Wed Feb 10 2016 Remi Collet - 2.5.5-3 +- drop scriptlets (replaced by file triggers in php-pear) +- cleanup + * Thu Feb 04 2016 Fedora Release Engineering - 2.5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild