From ab76cc9a9f95aae7ef1461ae136d93189bff6db8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Jun 2018 11:53:24 +0200 Subject: cleanup --- php-pecl-hrtime.spec | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/php-pecl-hrtime.spec b/php-pecl-hrtime.spec index 8a6fadc..2b6eb81 100644 --- a/php-pecl-hrtime.spec +++ b/php-pecl-hrtime.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-hrtime # -# Copyright (c) 2014-2017 Remi Collet +# Copyright (c) 2014-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,7 +11,7 @@ %scl_package php-pecl-hrtime %endif -%global with_zts 0%{?__ztsphp:1} +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name hrtime %if "%{php_version}" < "5.6" %global ini_name %{pecl_name}.ini @@ -22,14 +22,14 @@ Summary: High resolution timing Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 0.6.0 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel > 5.2 +BuildRequires: %{?dtsprefix}gcc +BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -47,14 +47,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # 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} @@ -139,7 +131,6 @@ make %{?_smp_mflags} %install %{?dtsenable} -rm -rf %{buildroot} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -161,7 +152,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -214,12 +205,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -234,6 +220,9 @@ rm -rf %{buildroot} %changelog +* Tue Jun 26 2018 Remi Collet - 0.6.0-3 +- cleanup + * Tue Jul 18 2017 Remi Collet - 0.6.0-2 - rebuild for PHP 7.2.0beta1 new API -- cgit