Improved backward compatibility
Resolves: rhbz#111633
This commit is contained in:
parent
9286df856c
commit
62620e2662
15
rrdtool.spec
15
rrdtool.spec
@ -17,7 +17,7 @@
|
|||||||
Summary: Round Robin Database Tool to store and display time-series data
|
Summary: Round Robin Database Tool to store and display time-series data
|
||||||
Name: rrdtool
|
Name: rrdtool
|
||||||
Version: 1.4.8
|
Version: 1.4.8
|
||||||
Release: 13%{?dist}
|
Release: 14%{?dist}
|
||||||
License: GPLv2+ with exceptions
|
License: GPLv2+ with exceptions
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
URL: http://oss.oetiker.ch/rrdtool/
|
URL: http://oss.oetiker.ch/rrdtool/
|
||||||
@ -25,7 +25,10 @@ Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
|
|||||||
Source1: php4-%{svnrev}.tar.gz
|
Source1: php4-%{svnrev}.tar.gz
|
||||||
Patch1: rrdtool-1.4.4-php54.patch
|
Patch1: rrdtool-1.4.4-php54.patch
|
||||||
# workaround for rhbz#92165
|
# workaround for rhbz#92165
|
||||||
|
# Do not apply on RHEL-6 or lower
|
||||||
|
%if %{?rhel} %{?!rhel:7} > 6
|
||||||
Patch2: rrdtool-1.4.7-ruby-2-fix.patch
|
Patch2: rrdtool-1.4.7-ruby-2-fix.patch
|
||||||
|
%endif
|
||||||
# disable logo for php 5.5.
|
# disable logo for php 5.5.
|
||||||
Patch3: rrdtool-1.4.7-php55.patch
|
Patch3: rrdtool-1.4.7-php55.patch
|
||||||
Patch4: rrdtool-1.4.7-autoconf-fix.patch
|
Patch4: rrdtool-1.4.7-autoconf-fix.patch
|
||||||
@ -140,6 +143,7 @@ The %{name}-tcl package includes RRDtool bindings for Tcl.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_ruby}
|
%if %{with_ruby}
|
||||||
|
%{!?ruby_vendorarchdir: %define ruby_vendorarchdir %(ruby -rrbconfig -e 'puts Config::CONFIG["vendorarchdir"]')}
|
||||||
|
|
||||||
%package ruby
|
%package ruby
|
||||||
Summary: Ruby RRDtool bindings
|
Summary: Ruby RRDtool bindings
|
||||||
@ -152,7 +156,7 @@ The %{name}-ruby package includes RRDtool bindings for Ruby.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_lua}
|
%if %{with_lua}
|
||||||
%define luaver 5.2
|
%{!?luaver: %define luaver %(lua -e "print(string.sub(_VERSION, 5))")}
|
||||||
%define lualibdir %{_libdir}/lua/%{luaver}
|
%define lualibdir %{_libdir}/lua/%{luaver}
|
||||||
%define luapkgdir %{_datadir}/lua/%{luaver}
|
%define luapkgdir %{_datadir}/lua/%{luaver}
|
||||||
|
|
||||||
@ -173,7 +177,10 @@ The %{name}-lua package includes RRDtool bindings for Lua.
|
|||||||
%patch1 -p1 -b .php54
|
%patch1 -p1 -b .php54
|
||||||
%patch3 -p1 -b .php55
|
%patch3 -p1 -b .php55
|
||||||
%endif
|
%endif
|
||||||
|
# Do not apply on RHEL-6 or lower
|
||||||
|
%if %{?rhel} %{?!rhel:7} > 6
|
||||||
%patch2 -p1 -b .ruby-2-fix
|
%patch2 -p1 -b .ruby-2-fix
|
||||||
|
%endif
|
||||||
%patch4 -p1 -b .autoconf-fix
|
%patch4 -p1 -b .autoconf-fix
|
||||||
%patch5 -p1 -b .lua-52
|
%patch5 -p1 -b .lua-52
|
||||||
%patch6 -p1 -b .imginfo-check
|
%patch6 -p1 -b .imginfo-check
|
||||||
@ -391,6 +398,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 24 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.8-14
|
||||||
|
- Improved backward compatibility
|
||||||
|
Resolves: rhbz#111633
|
||||||
|
|
||||||
* Thu Jun 19 2014 Remi Collet <rcollet@redhat.com> - 1.4.8-13
|
* Thu Jun 19 2014 Remi Collet <rcollet@redhat.com> - 1.4.8-13
|
||||||
- rebuild for https://fedoraproject.org/wiki/Changes/Php56
|
- rebuild for https://fedoraproject.org/wiki/Changes/Php56
|
||||||
- add numerical prefix to extension configuration file
|
- add numerical prefix to extension configuration file
|
||||||
|
Loading…
Reference in New Issue
Block a user