New version
Resolves: rhbz#783553 - Dropped fix-tcl-site-option patch (upstreamed)
This commit is contained in:
parent
159abba020
commit
0de2de7f90
9
.gitignore
vendored
9
.gitignore
vendored
@ -1,9 +1,2 @@
|
|||||||
php4-r1190.tar.gz
|
php4-r1190.tar.gz
|
||||||
rrdtool-1.3.3.tar.gz
|
rrdtool-*.tar.gz
|
||||||
rrdtool-1.3.4.tar.gz
|
|
||||||
rrdtool-1.3.5.tar.gz
|
|
||||||
rrdtool-1.3.6.tar.gz
|
|
||||||
rrdtool-1.3.7.tar.gz
|
|
||||||
rrdtool-1.3.8.tar.gz
|
|
||||||
/rrdtool-1.4.4.tar.gz
|
|
||||||
/php4-r1190.tar.gz
|
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
--- rrdtool-1.4.4/configure.old 2010-11-23 14:39:42.000000000 +0100
|
|
||||||
+++ rrdtool-1.4.4/configure 2010-11-23 14:40:32.656140783 +0100
|
|
||||||
@@ -1036,6 +1036,7 @@
|
|
||||||
enable_lua_site_install
|
|
||||||
enable_tcl
|
|
||||||
with_tcllib
|
|
||||||
+enable_tcl_site
|
|
||||||
enable_python
|
|
||||||
'
|
|
||||||
ac_precious_vars='build_alias
|
|
||||||
@@ -28584,9 +28585,9 @@
|
|
||||||
TCL_INCLUDE_SPEC="$TCL_INCLUDE_SPEC -I$TCL_INC_DIR"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
- # Check whether --enable-tcl was given.
|
|
||||||
-if test "${enable_tcl+set}" = set; then
|
|
||||||
- enableval=$enable_tcl;
|
|
||||||
+ # Check whether --enable-tcl-site was given.
|
|
||||||
+if test "${enable_tcl_site+set}" = set; then
|
|
||||||
+ enableval=$enable_tcl_site;
|
|
||||||
else
|
|
||||||
enable_tcl_site=yes
|
|
||||||
fi
|
|
12
rrdtool.spec
12
rrdtool.spec
@ -17,15 +17,13 @@
|
|||||||
|
|
||||||
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.4
|
Version: 1.4.7
|
||||||
Release: 9%{?dist}
|
Release: 1%{?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/
|
||||||
Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
|
Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
|
||||||
Source1: php4-%{svnrev}.tar.gz
|
Source1: php4-%{svnrev}.tar.gz
|
||||||
# Fix tcl-site configure option (upstream ticket #281)
|
|
||||||
Patch0: rrdtool-1.4.4-fix-tcl-site-option.patch
|
|
||||||
Patch1: rrdtool-1.4.4-php54.patch
|
Patch1: rrdtool-1.4.4-php54.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -164,7 +162,6 @@ The %{name}-lua package includes RRDtool bindings for Lua.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version} %{?with_php: -a 1}
|
%setup -q -n %{name}-%{version} %{?with_php: -a 1}
|
||||||
%patch0 -p1 -b .fix-tcl-site-option
|
|
||||||
%if %{with_php}
|
%if %{with_php}
|
||||||
%patch1 -p1 -b .php54
|
%patch1 -p1 -b .php54
|
||||||
%endif
|
%endif
|
||||||
@ -376,6 +373,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 26 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.7-1
|
||||||
|
- New version
|
||||||
|
Resolves: rhbz#783553
|
||||||
|
- Dropped fix-tcl-site-option patch (upstreamed)
|
||||||
|
|
||||||
* Thu Jan 19 2012 Remi Collet <remi@fedoraproject.org> - 1.4.4-9
|
* Thu Jan 19 2012 Remi Collet <remi@fedoraproject.org> - 1.4.4-9
|
||||||
- build with php 5.4
|
- build with php 5.4
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user