From 4e111618be5a07403f3c3a77df4abdb6c886930d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 14:25:58 +0100 Subject: cleanup for EL-8 --- php-pecl-newt.spec | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/php-pecl-newt.spec b/php-pecl-newt.spec index afcbfab..7089e9c 100644 --- a/php-pecl-newt.spec +++ b/php-pecl-newt.spec @@ -1,18 +1,14 @@ # remirepo spec file for php-pecl-newt # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-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-newt} @@ -33,7 +29,6 @@ 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: newt-devel @@ -135,8 +130,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -158,7 +151,7 @@ do install -Dpm 644 $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 @@ -194,12 +187,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 -- cgit