From 2ba0a185e34156c6247ca980e376b089201e3c5d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Apr 2014 18:17:09 +0200 Subject: php-pecl: add numerical prefix to extension configuration file (3) --- php-pecl-raphf.spec | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'php-pecl-raphf.spec') diff --git a/php-pecl-raphf.spec b/php-pecl-raphf.spec index 2871ab8..b02b960 100644 --- a/php-pecl-raphf.spec +++ b/php-pecl-raphf.spec @@ -17,11 +17,16 @@ # tests disabled because of circular dependency on pecl/http # tests requires pecl/http 2.0.0 %global with_tests %{?_with_tests:1}%{!?_with_tests:0} +%if "%{php_version}" < "5.6" +%global ini_name %{pecl_name}.ini +%else +%global ini_name 40-%{pecl_name}.ini +%endif Summary: Resource and persistent handles factory Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.0.4 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -44,7 +49,7 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if 0%{!?scl:1} +%if "%{?vendor}" == "Remi Collet" # Other third party repo stuff %if "%{php_version}" > "5.4" Obsoletes: php53-pecl-%{pecl_name} @@ -54,6 +59,9 @@ Obsoletes: php54-pecl-%{pecl_name} %if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} %endif +%if "%{php_version}" > "5.6" +Obsoletes: php56u-pecl-%{pecl_name} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -97,7 +105,7 @@ cp -pr NTS ZTS %endif # Create configuration file -cat << 'EOF' | tee %{pecl_name}.ini +cat << 'EOF' | tee %{ini_name} ; Enable %{pecl_name} extension module extension=%{pecl_name}.so @@ -129,7 +137,7 @@ make -C NTS \ install INSTALL_ROOT=%{buildroot} # install config file -install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_inidir}/%{pecl_name}.ini +install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} # Install XML package description install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml @@ -138,7 +146,7 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml make -C ZTS \ install INSTALL_ROOT=%{buildroot} -install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini +install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif # Test & Documentation @@ -208,11 +216,11 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml -%config(noreplace) %{php_inidir}/%{pecl_name}.ini +%config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so %if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{pecl_name}.ini +%config(noreplace) %{php_ztsinidir}/%{ini_name} %{php_ztsextdir}/%{pecl_name}.so %endif @@ -227,6 +235,9 @@ rm -rf %{buildroot} %changelog +* Wed Apr 9 2014 Remi Collet - 1.0.4-3 +- add numerical prefix to extension configuration file + * Tue Mar 18 2014 Remi Collet - 1.0.4-2 - adapt for SCL -- cgit