[php-pecl-rrd] add numerical prefix to extension configuration file
Remi Collet
remi at fedoraproject.org
Thu Apr 24 07:52:02 UTC 2014
commit 2f7350b1c1c47e200210d58606187828dcc4df70
Author: Remi Collet <remi at fedoraproject.org>
Date: Thu Apr 24 09:51:55 2014 +0200
add numerical prefix to extension configuration file
php-pecl-rrd.spec | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/php-pecl-rrd.spec b/php-pecl-rrd.spec
index 1885ce2..5cef54b 100644
--- a/php-pecl-rrd.spec
+++ b/php-pecl-rrd.spec
@@ -12,11 +12,16 @@
%global with_zts 0%{?__ztsphp:1}
%global pecl_name rrd
+%if 0%{?fedora} < 21
+%global ini_name %{pecl_name}.ini
+%else
+%global ini_name 40-%{pecl_name}.ini
+%endif
Summary: PHP Bindings for rrdtool
Name: php-pecl-rrd
Version: 1.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/rrd
@@ -40,7 +45,7 @@ Provides: php-%{pecl_name} = %{version}%{?pre}
Provides: php-%{pecl_name}%{?_isa} = %{version}%{?pre}
-%if 0%{?fedora} < 20
+%if 0%{?fedora} < 20 && 0%{?rhel} < 7
# Filter shared private
%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
%{?filter_setup}
@@ -57,7 +62,7 @@ system for time series data.
mv %{pecl_name}-%{version} NTS
-cat > %{pecl_name}.ini << 'EOF'
+cat > %{ini_name} << 'EOF'
; Enable %{pecl_name} extension module
extension=%{pecl_name}.so
EOF
@@ -85,14 +90,14 @@ make %{?_smp_mflags}
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
@@ -150,17 +155,20 @@ fi
%files
%doc %{pecl_docdir}/%{pecl_name}
%doc %{pecl_testdir}/%{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
+* Thu Apr 24 2014 Remi Collet <rcollet at redhat.com> - 1.1.3-2
+- add numerical prefix to extension configuration file
+
* Wed Jan 15 2014 Remi Collet <remi at fedoraproject.org> - 1.1.3-1
- Update to 1.1.3 (stable)
- drop merged patch
More information about the scm-commits
mailing list