[php-pecl-memcached] add numerical prefix to extension configuration file

Remi Collet remi at fedoraproject.org
Thu Apr 24 06:18:04 UTC 2014


commit f59027d2836604bbe943d8070af41505ae395ceb
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Apr 24 08:17:55 2014 +0200

    add numerical prefix to extension configuration file

 php-pecl-memcached.spec |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 5b43599..830a5d5 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -12,11 +12,18 @@
 %global with_zts    0%{?__ztsphp:1}
 %global with_tests  %{?_with_tests:1}%{!?_with_tests:0}
 %global pecl_name   memcached
+%if 0%{?fedora} < 21
+# After igbinary, json, msgpack
+%global ini_name  z-%{pecl_name}.ini
+%else
+# After 40-igbinary, 40-json, 40-msgpack
+%global ini_name  50-%{pecl_name}.ini
+%endif
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcached
 Version:      2.2.0
-Release:      1%{?dist}
+Release:      2%{?dist}
 # memcached is PHP, FastLZ is MIT
 License:      PHP and MIT
 Group:        Development/Languages
@@ -87,7 +94,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
 
@@ -108,7 +115,7 @@ extension=%{pecl_name}.so
 EOF
 
 # default options with description from upstream
-cat NTS/memcached.ini >>%{pecl_name}.ini
+cat NTS/memcached.ini >>%{ini_name}
 
 %if %{with_zts}
 cp -r NTS ZTS
@@ -145,7 +152,7 @@ make install -C NTS INSTALL_ROOT=%{buildroot}
 
 # Drop in the bit of configuration
 # rename to z-memcached to be load after msgpack
-install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_inidir}/z-%{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
@@ -153,7 +160,7 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 # Install the ZTS extension
 %if %{with_zts}
 make install -C ZTS INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/z-%{pecl_name}.ini
+install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 # Test & Documentation
@@ -236,16 +243,19 @@ exit $ret
 %doc %{pecl_testdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
-%config(noreplace) %{php_inidir}/z-%{pecl_name}.ini
+%config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
 
 %if %{with_zts}
-%config(noreplace) %{php_ztsinidir}/z-%{pecl_name}.ini
+%config(noreplace) %{php_ztsinidir}/%{ini_name}
 %{php_ztsextdir}/%{pecl_name}.so
 %endif
 
 
 %changelog
+* Thu Apr 24 2014 Remi Collet <rcollet at redhat.com> - 2.2.0-2
+- add numerical prefix to extension configuration file
+
 * Wed Apr  2 2014  Remi Collet <remi at fedoraproject.org> - 2.2.0-1
 - update to 2.2.0 (stable)
 - add all ini options in configuration file (comments)


More information about the scm-commits mailing list