From 21a0d15718c37837db3f43d81aa02468cb9219b7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 14:27:41 +0100 Subject: cleanup for EL-8 --- php-pecl-oauth.spec | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec index 35d82db..b6f9410 100644 --- a/php-pecl-oauth.spec +++ b/php-pecl-oauth.spec @@ -9,12 +9,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-oauth} @@ -28,14 +24,13 @@ Name: %{?sub_prefix}php-pecl-oauth Version: 1.2.3 -Release: 11%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 12%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP OAuth consumer extension Group: Development/Languages License: BSD URL: http://pecl.php.net/package/oauth Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: pcre-devel @@ -127,8 +122,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make install -C NTS INSTALL_ROOT=%{buildroot} # Drop in the bit of configuration @@ -149,11 +142,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 @@ -188,7 +177,6 @@ fi %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -203,6 +191,9 @@ fi %changelog +* Mon Jan 21 2019 Remi Collet - 1.2.3-12 +- cleanup for EL-8 + * Tue Mar 8 2016 Remi Collet - 1.2.3-11 - adapt for F24 -- cgit