From ab7bdd582c198def84a00f40c49bd1b8f3106d90 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 15:22:04 +0100 Subject: cleanup for EL-8 --- php-pecl-sphinx.spec | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/php-pecl-sphinx.spec b/php-pecl-sphinx.spec index 16c58a4..6dd2621 100644 --- a/php-pecl-sphinx.spec +++ b/php-pecl-sphinx.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-sphinx # -# Copyright (c) 2011-2017 Remi Collet +# Copyright (c) 2011-2019 Remi Collet # # Fedora spec file for php-pecl-sphinx # @@ -10,12 +10,8 @@ # 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-selinux} @@ -29,14 +25,13 @@ Name: %{?sub_prefix}php-pecl-sphinx Version: 1.3.3 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PECL extension for Sphinx SQL full-text search engine Group: Development/Languages License: PHP 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: libsphinxclient-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-devel @@ -142,8 +137,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # Install XML package description @@ -165,11 +158,7 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%clean -rm -rf %{buildroot} - - -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 7 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -190,7 +179,6 @@ fi %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -205,6 +193,9 @@ fi %changelog +* Mon Jan 21 2019 Remi Collet - 1.3.3-4 +- cleanup for EL-8 + * Tue Mar 8 2016 Remi Collet - 1.3.3-3 - adapt for F24 -- cgit