From 10b1c3a736f832fb5e3e71f7ad2b1ff8f4edc2c8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Feb 2019 15:18:56 +0100 Subject: cleanup SCL stuff for Fedora review --- php-pecl-pcov.spec | 86 +++++++++++------------------------------------------- 1 file changed, 17 insertions(+), 69 deletions(-) diff --git a/php-pecl-pcov.spec b/php-pecl-pcov.spec index 2111fc0..52ff06e 100644 --- a/php-pecl-pcov.spec +++ b/php-pecl-pcov.spec @@ -1,4 +1,7 @@ -# spec file for php-pecl-pcov +# Fedora spec file for php-pecl-pcov +# with SCL stuff removed from: +# +# remirepo spec file for php-pecl-pcov # # Copyright (c) 2019 Remi Collet # License: CC-BY-SA @@ -6,67 +9,34 @@ # # Please, preserve the changelog entries # -%{?scl: %scl_package php-pecl-pcov} - %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name pcov %global ini_name 40-%{pecl_name}.ini Summary: Code coverage driver -Name: %{?scl_prefix}php-pecl-%{pecl_name} +Name: php-pecl-%{pecl_name} Version: 1.0.0 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist} License: PHP URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz BuildRequires: gcc -BuildRequires: %{?scl_prefix}php-devel > 7.1 -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} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif +BuildRequires: php-devel > 7.1 +BuildRequires: php-pear -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.3" -Obsoletes: php73u-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} -%endif -%endif +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared object -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif +Provides: php-%{pecl_name} = %{version} +Provides: php-%{pecl_name}%{?_isa} = %{version} +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} %description A self contained php-code-coverage compatible driver for PHP7. -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 %setup -q -c @@ -112,8 +82,6 @@ EOF %build -%{?dtsenable} - cd NTS %{_bindir}/phpize %configure \ @@ -136,8 +104,6 @@ make %{?_smp_mflags} %install -%{?dtsenable} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -159,26 +125,6 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# 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 - - %check : Minimal load test for NTS extension cd NTS @@ -211,7 +157,6 @@ REPORT_EXIT_STATUS=1 \ %files -%{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -225,6 +170,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Fri Feb 1 2019 Remi Collet - 1.0.0-2 +- cleanup SCL stuff for Fedora review + * Wed Jan 30 2019 Remi Collet - 1.0.0-1 - update to 1.0.0 (stable) - raise dependency on PHP 7.1 -- cgit