[rrdtool] rebuild for https://fedoraproject.org/wiki/Changes/Php56
Remi Collet
remi at fedoraproject.org
Thu Jun 19 16:25:39 UTC 2014
commit 9286df856c03a77e86e2748e6d586803882e0e6f
Author: Remi Collet <remi at fedoraproject.org>
Date: Thu Jun 19 18:25:32 2014 +0200
rebuild for https://fedoraproject.org/wiki/Changes/Php56
rrdtool.spec | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/rrdtool.spec b/rrdtool.spec
index c5e7617..b2570de 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -7,15 +7,17 @@
%define svnrev r1190
#define pretag 1.2.99908020600
-# Private libraries are not be exposed globally by RPM
-# RPM 4.9
-%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
+%if "%{php_version}" < "5.6"
+%global ini_name %{name}.ini
+%else
+%global ini_name 40-%{name}.ini
+%endif
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
Version: 1.4.8
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPLv2+ with exceptions
Group: Applications/Databases
URL: http://oss.oetiker.ch/rrdtool/
@@ -272,7 +274,7 @@ make DESTDIR="$RPM_BUILD_ROOT" install
%{__rm} -rf php4/examples/.svn
# Put the php config bit into place
%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
-%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/rrdtool.ini
+%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{ini_name}
; Enable rrdtool extension module
extension=rrdtool.so
__EOF__
@@ -361,7 +363,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
%files php
%defattr(-,root,root,0755)
%doc php4/examples php4/README
-%config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
+%config(noreplace) %{_sysconfdir}/php.d/%{ini_name}
%{php_extdir}/rrdtool.so
%endif
@@ -389,6 +391,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
%endif
%changelog
+* Thu Jun 19 2014 Remi Collet <rcollet at redhat.com> - 1.4.8-13
+- rebuild for https://fedoraproject.org/wiki/Changes/Php56
+- add numerical prefix to extension configuration file
+- cleanup filter (no more needed in F20+)
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.8-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list