From db1409bf28dc925e758d99a5d67d8e1cb0d8c149 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 15:55:41 +0100 Subject: cleanup for EL-8 --- php-pecl-xmp.spec | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/php-pecl-xmp.spec b/php-pecl-xmp.spec index 8851a58..edac50c 100644 --- a/php-pecl-xmp.spec +++ b/php-pecl-xmp.spec @@ -1,6 +1,6 @@ # spec file for php-pecl-xmp # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -20,13 +20,12 @@ Summary: Bindings for the libxmp library Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 4.2.0 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: ASL 2.0 -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: gcc BuildRequires: libxmp-devel BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -119,8 +118,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -141,7 +138,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 @@ -195,12 +192,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} @@ -215,6 +207,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 21 2019 Remi Collet - 4.2.0-3 +- cleanup for EL-8 + * Wed Mar 9 2016 Remi Collet - 4.2.0-2 - adapt for F24 - drop runtime dependency on pear, new scriptlets -- cgit