New version

Resolves: rhbz#783553
- Dropped fix-tcl-site-option patch (upstreamed)
This commit is contained in:
Jaroslav Škarvada 2012-01-26 10:39:14 +01:00
parent 159abba020
commit 0de2de7f90
4 changed files with 9 additions and 38 deletions

9
.gitignore vendored
View File

@ -1,9 +1,2 @@
php4-r1190.tar.gz
rrdtool-1.3.3.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
rrdtool-*.tar.gz

View File

@ -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

View File

@ -17,15 +17,13 @@
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
Version: 1.4.4
Release: 9%{?dist}
Version: 1.4.7
Release: 1%{?dist}
License: GPLv2+ with exceptions
Group: Applications/Databases
URL: http://oss.oetiker.ch/rrdtool/
Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -164,7 +162,6 @@ The %{name}-lua package includes RRDtool bindings for Lua.
%prep
%setup -q -n %{name}-%{version} %{?with_php: -a 1}
%patch0 -p1 -b .fix-tcl-site-option
%if %{with_php}
%patch1 -p1 -b .php54
%endif
@ -376,6 +373,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
%endif
%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
- build with php 5.4

View File

@ -1,2 +1 @@
93ad2fc2e9ddcd7d99c611fe30284a54 rrdtool-1.4.4.tar.gz
28074a9c368af013462631959ab90558 php4-r1190.tar.gz
ffe369d8921b4dfdeaaf43812100c38f rrdtool-1.4.7.tar.gz