From f054f90830f9c8d123d79c11aa52d5bf6611c0f8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Apr 2014 16:18:29 +0200 Subject: php-pecl: add numerical prefix to extension configuration file (more) --- php-pecl-oauth.spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec index c856cee..810fd36 100644 --- a/php-pecl-oauth.spec +++ b/php-pecl-oauth.spec @@ -5,10 +5,15 @@ %global pecl_name oauth %global with_zts 0%{?__ztsphp:1} +%if "%{php_version}" < "5.6" +%global ini_name %{pecl_name}.ini +%else +%global ini_name 40-%{pecl_name}.ini +%endif Name: %{?scl_prefix}php-pecl-oauth Version: 1.2.3 -Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Summary: PHP OAuth consumer extension Group: Development/Languages License: BSD @@ -69,7 +74,7 @@ if test "x${extver}" != "x%{version}"; then exit 1 fi -cat >%{pecl_name}.ini << 'EOF' +cat >%{ini_name} << 'EOF' ; Enable %{pecl_name} extension module extension=%{pecl_name}.so EOF @@ -100,14 +105,14 @@ rm -rf %{buildroot} make install -C NTS INSTALL_ROOT=%{buildroot} # Drop in the bit of configuration -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 %if %{with_zts} make install -C ZTS 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 @@ -148,17 +153,20 @@ fi %files %defattr(-,root,root,-) %doc %{pecl_docdir}/%{pecl_name} -%config(noreplace) %{php_inidir}/%{pecl_name}.ini +%config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so %{pecl_xmldir}/%{name}.xml %if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{pecl_name}.ini +%config(noreplace) %{php_ztsinidir}/%{ini_name} %{php_ztsextdir}/%{pecl_name}.so %endif %changelog +* Wed Apr 16 2014 Remi Collet - 1.2.3-6 +- add numerical prefix to extension configuration file (php 5.6) + * Wed Mar 19 2014 Remi Collet - 1.2.3-5 - allow SCL build @@ -203,7 +211,7 @@ fi * Sun Jun 19 2011 F. Kooman - 1.1.0-6 - add fix for http://pecl.php.net/bugs/bug.php?id=22337 -* Wed Jun 14 2011 Remi Collet - 1.1.0-5 +* Tue Jun 14 2011 Remi Collet - 1.1.0-5 - rebuild for remi repo * Mon Jun 13 2011 F. Kooman - 1.1.0-5 -- cgit