From 2231f288468ff82813be706e331ea15c89f859ce Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Mar 2019 08:30:55 +0100 Subject: cleanup for EL-8 --- php-pecl-yaf.spec | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/php-pecl-yaf.spec b/php-pecl-yaf.spec index f3742e5..e71cf18 100644 --- a/php-pecl-yaf.spec +++ b/php-pecl-yaf.spec @@ -1,18 +1,14 @@ # remirepo spec file for php-pecl-yaf # -# Copyright (c) 2012-2017 Remi Collet +# Copyright (c) 2012-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -%else %global sub_prefix %{scl_prefix} %endif -%endif %{?scl: %scl_package php-pecl-yaf} @@ -27,14 +23,13 @@ Summary: Yet Another Framework Name: %{?sub_prefix}php-pecl-yaf Version: 2.3.5 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP -Group: Development/Languages URL: http://pecl.php.net/package/yaf Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Source1: %{pecl_name}.ini -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: gcc BuildRequires: %{?scl_prefix}php-devel >= 5.2.0 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pcre-devel @@ -119,7 +114,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} # Install the NTS stuff make -C NTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name} @@ -169,7 +163,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%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 @@ -189,12 +183,7 @@ fi %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -209,6 +198,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 21 2019 Remi Collet - 2.3.5-3 +- cleanup for EL-8 + * Wed Mar 9 2016 Remi Collet - 2.3.5-2 - adapt for F24 -- cgit