From ade5dffd24bacde828efd1996e2a75b072bd0d0e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 16:01:08 +0100 Subject: cleanup for EL-8 --- php-pecl-xslcache.spec | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/php-pecl-xslcache.spec b/php-pecl-xslcache.spec index caef70c..b5d6411 100644 --- a/php-pecl-xslcache.spec +++ b/php-pecl-xslcache.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-xslcache # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -21,9 +21,8 @@ Summary: XSL extension that caches the parsed XSL style sheet Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 0.7.2 -Release: 6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 7%{?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 @@ -31,7 +30,7 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz # Link from the headers Source1: http://www.php.net/license/3_01.txt -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-dom @@ -136,8 +135,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -160,7 +157,7 @@ done %{!?_licensedir:install -Dpm 644 LICENSE %{buildroot}%{pecl_docdir}/%{pecl_name}/LICENSE} -%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 @@ -198,12 +195,7 @@ cd ../ZTS %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -218,6 +210,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 21 2019 Remi Collet - 0.7.2-7 +- cleanup for EL-8 + * Wed Mar 9 2016 Remi Collet - 0.7.2-6 - adapt for F24 - drop runtime dependency on pear, new scriptlets -- cgit