From 051e942477ad3c6525e48d23c013bfa51ba1a6e9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 17 Feb 2018 10:46:19 +0100 Subject: cleanup --- php-pecl-xdiff.spec | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'php-pecl-xdiff.spec') diff --git a/php-pecl-xdiff.spec b/php-pecl-xdiff.spec index 52d5869..cec692a 100644 --- a/php-pecl-xdiff.spec +++ b/php-pecl-xdiff.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-xdiff # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -19,7 +19,6 @@ Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.5.2 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: File differences/patches -Group: Development/Languages # libxdiff is LGPLv2+, xdiff extension is PHP License: PHP and LGPLv2+ URL: http://pecl.php.net/package/%{pecl_name} @@ -30,7 +29,6 @@ Source2: config.m4 # http://git.php.net/?p=pecl/text/xdiff.git;a=blob_plain;f=LICENSE;hb=HEAD Source3: LICENSE -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -128,8 +126,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make install -C NTS INSTALL_ROOT=%{buildroot} # Drop in the bit of configuration @@ -150,7 +146,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 @@ -197,16 +193,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{__ztsphp} -n run-tests.php - %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE NTS/libxdiff_COPYING} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml -- cgit