From 8d2bbb722d241a029c5f4bc1c647e77be7d6e51b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 3 Oct 2017 13:28:10 +0200 Subject: clean-up --- php-pecl-mcrypt.spec | 72 +++++++++++++--------------------------------------- 1 file changed, 18 insertions(+), 54 deletions(-) diff --git a/php-pecl-mcrypt.spec b/php-pecl-mcrypt.spec index 3686ec4..4409b75 100644 --- a/php-pecl-mcrypt.spec +++ b/php-pecl-mcrypt.spec @@ -1,3 +1,6 @@ +# Fedora spec file for php-pecl-mcrypt +# without SCL compatibility, from +# # remirepo spec file for php-pecl-mcrypt # # Copyright (c) 2017 Remi Collet @@ -6,54 +9,37 @@ # # Please, preserve the changelog entries # -%{?scl: %scl_package php-pecl-mcrypt} - %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name mcrypt %global ini_name 30-%{pecl_name}.ini Summary: Bindings for the libmcrypt library -Name: %{?scl_prefix}php-pecl-mcrypt +Name: php-pecl-mcrypt Version: 1.0.1 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/mcrypt Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -BuildRequires: %{?scl_prefix}php-devel > 7.2 +BuildRequires: php-devel > 7.2 BuildRequires: libmcrypt-devel -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(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name} = 1:%{version}-%{release} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = 1:%{version}-%{release} - -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -%endif - -Obsoletes: %{?scl_prefix}php-mcrypt < 7.2.0 +BuildRequires: php-pear +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} +Obsoletes: php-%{pecl_name} < 7.2.0 +Provides: php-%{pecl_name} = 1:%{version}-%{release} +Provides: php-%{pecl_name}%{?_isa} = 1:%{version}-%{release} %description Provides bindings for the unmaintained libmcrypt. -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{scl_vendor})}. %prep @@ -89,8 +75,6 @@ cp -pr NTS ZTS %build -%{?dtsenable} - cd NTS %{_bindir}/phpize %configure \ @@ -111,8 +95,6 @@ make %{?_smp_mflags} %install -%{?dtsenable} - make -C NTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -161,29 +143,8 @@ make test %endif -%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 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %files -%{?_licensedir:%license NTS/LICENSE} -%{!?_licensedir:%doc %{pecl_docdir}/%{pecl_name}} +%license NTS/LICENSE %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -196,6 +157,9 @@ fi %changelog +* Tue Oct 3 2017 Remi Collet - 1.0.1-1 +- clean-up for Fedora review + * Tue Jul 18 2017 Remi Collet - 1.0.1-4 - rebuild for PHP 7.2.0beta1 new API -- cgit