From e29f83fe52ea77d9a4bceac3ad7cf770d886f19e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 15:31:35 +0100 Subject: cleanup for EL-8 --- php-pecl-strict.spec | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/php-pecl-strict.spec b/php-pecl-strict.spec index 709d9e1..2a9e912 100644 --- a/php-pecl-strict.spec +++ b/php-pecl-strict.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-strict # -# Copyright (c) 2014-2017 Remi Collet +# Copyright (c) 2014-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -21,13 +21,12 @@ Summary: Strict scalar parameter type hint Name: %{?scl_prefix}php-pecl-strict Version: 0.4.1 -Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP 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.3 BuildRequires: %{?scl_prefix}php-pear BuildRequires: Judy-devel @@ -138,8 +137,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -160,7 +157,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 +211,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 +226,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 21 2019 Remi Collet - 0.4.1-4 +- cleanup for EL-8 + * Tue Mar 8 2016 Remi Collet - 0.4.1-3 - adapt for F24 -- cgit