From 17439c984154b7a3d21bc7d7dbae102b8b2fe2a3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 15:03:51 +0100 Subject: cleanup for EL-8 --- php-pecl-riak.spec | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/php-pecl-riak.spec b/php-pecl-riak.spec index 20258de..f5ac009 100644 --- a/php-pecl-riak.spec +++ b/php-pecl-riak.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-riak # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -28,13 +28,12 @@ Summary: Riak database PHP extension Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.2.0 -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: ASL 2.0 and 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.3 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pcre-devel @@ -144,8 +143,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS \ install INSTALL_ROOT=%{buildroot} @@ -169,7 +166,7 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 7 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -216,12 +213,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 @@ -236,6 +228,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 21 2019 Remi Collet - 1.2.0-4 +- cleanup for EL-8 + * Tue Mar 8 2016 Remi Collet - 1.2.0-3 - adapt for F24 - drop runtime dependency on pear, new scriptlets -- cgit