From 19372254157740b92a9f6a814da5f5d7f233c3e6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Apr 2014 09:58:41 +0200 Subject: php-pecl: add numerical prefix to extension configuration file (more) --- php-pecl-lua.spec | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/php-pecl-lua.spec b/php-pecl-lua.spec index 080c16b..497a830 100644 --- a/php-pecl-lua.spec +++ b/php-pecl-lua.spec @@ -12,13 +12,18 @@ %{!?__pecl: %global __pecl %{_bindir}/pecl} %{!?__php: %global __php %{_bindir}/php} -%global with_zts 0%{?__ztsphp:1} -%global pecl_name lua +%global with_zts 0%{?__ztsphp:1} +%global pecl_name lua +%if "%{php_version}" < "5.6" +%global ini_name %{pecl_name}.ini +%else +%global ini_name 40-%{pecl_name}.ini +%endif Summary: Embedded lua interpreter Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.1.0 -Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -97,7 +102,7 @@ cp -pr NTS ZTS %endif # Create configuration file -cat > %{pecl_name}.ini << 'EOF' +cat > %{ini_name} << 'EOF' ; Enable %{pecl_name} extension module extension=%{pecl_name}.so EOF @@ -130,7 +135,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 @@ -139,7 +144,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 @@ -200,16 +205,19 @@ rm -rf %{buildroot} %doc %{pecl_docdir}/%{pecl_name} %doc %{pecl_testdir}/%{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 %changelog +* Wed Apr 16 2014 Remi Collet - 1.1.0-4 +- add numerical prefix to extension configuration file + * Tue Mar 18 2014 Remi Collet - 1.1.0-3 - adapt for SCL -- cgit