From f8c4656e771e5f5b6c3e423c46a705d11130380b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 May 2019 14:53:13 +0200 Subject: cleanup --- php-pecl-stomp.spec | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/php-pecl-stomp.spec b/php-pecl-stomp.spec index c410cf8..76d672e 100644 --- a/php-pecl-stomp.spec +++ b/php-pecl-stomp.spec @@ -1,6 +1,6 @@ # remimrepo/fedora spec file for php-pecl-stomp # -# Copyright (c) 2014-2017 Remi Collet +# Copyright (c) 2014-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -22,13 +22,12 @@ Summary: Stomp client extension Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.0.9 -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: 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 BuildRequires: %{?scl_prefix}php-pear BuildRequires: openssl-devel @@ -141,8 +140,6 @@ peclbuild %{_bindir}/zts-php-config %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -163,7 +160,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 @@ -199,12 +196,7 @@ fi %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -219,6 +211,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 21 2019 Remi Collet - 1.0.9-3 +- cleanup for EL-8 + * Tue Mar 8 2016 Remi Collet - 1.0.9-2 - adapt for F24 -- cgit