rpms/rrdtool/devel rrdtool-1.2.21-python.patch, NONE, 1.1 rrdtool-1.2.21-tclbindings.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 rrdtool.spec, 1.32, 1.33 sources, 1.15, 1.16 rrdtool-1.2.19-python.patch, 1.1, NONE

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10138

Modified Files:
	.cvsignore rrdtool.spec sources 
Added Files:
	rrdtool-1.2.21-python.patch rrdtool-1.2.21-tclbindings.patch 
Removed Files:
	rrdtool-1.2.19-python.patch 
Log Message:
New upstream rrdtool release, v1.2.21

rrdtool-1.2.21-python.patch:

--- NEW FILE rrdtool-1.2.21-python.patch ---
diff -urp rrdtool-1.2.21.orig/bindings/Makefile.am rrdtool-1.2.21/bindings/Makefile.am
--- rrdtool-1.2.21.orig/bindings/Makefile.am	2007-05-01 16:42:02.000000000 -0400
+++ rrdtool-1.2.21/bindings/Makefile.am	2007-05-02 10:38:19.000000000 -0400
@@ -20,7 +20,7 @@ install-data-local:
 	test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true
 	test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true
 	test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true
-	test -d python/build && cd python && rm -rf build && env LIBDIR=$(libdir) $(PYTHON) setup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) || true
+	test -d python/build && cd python && rm -rf build && env LIBDIR=$(libdir) $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true
 
 # rules for buildung the ruby module
 ruby: 
diff -urp rrdtool-1.2.21.orig/bindings/Makefile.in rrdtool-1.2.21/bindings/Makefile.in
--- rrdtool-1.2.21.orig/bindings/Makefile.in	2007-05-01 16:42:26.000000000 -0400
+++ rrdtool-1.2.21/bindings/Makefile.in	2007-05-02 10:38:38.000000000 -0400
@@ -542,7 +542,7 @@ install-data-local:
 	test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true
 	test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true
 	test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true
-	test -d python/build && cd python && rm -rf build && env LIBDIR=$(libdir) $(PYTHON) setup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) || true
+	test -d python/build && cd python && rm -rf build && env LIBDIR=$(libdir) $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true
 
 # rules for buildung the ruby module
 ruby: 

rrdtool-1.2.21-tclbindings.patch:

--- NEW FILE rrdtool-1.2.21-tclbindings.patch ---
diff -urp rrdtool-1.2.21.orig/bindings/tcl/tclrrd.c rrdtool-1.2.21/bindings/tcl/tclrrd.c
--- rrdtool-1.2.21.orig/bindings/tcl/tclrrd.c	2007-05-01 16:42:02.000000000 -0400
+++ rrdtool-1.2.21/bindings/tcl/tclrrd.c	2007-05-02 09:44:32.000000000 -0400
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <tcl.h>
 #include "../../src/rrd_tool.h"
-#include "../../rrd_format.h"
+#include "../../src/rrd_format.h"
 
 /* support pre-8.4 tcl */
 
Only in rrdtool-1.2.21.orig: rrdtool-1.2.21


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Apr 2007 14:18:07 -0000	1.12
+++ .cvsignore	2 May 2007 14:55:52 -0000	1.13
@@ -5,3 +5,4 @@
 rrdtool-1.2.17.tar.gz
 rrdtool-1.2.18.tar.gz
 rrdtool-1.2.19.tar.gz
+rrdtool-1.2.21.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rrdtool.spec	25 Apr 2007 15:46:34 -0000	1.32
+++ rrdtool.spec	2 May 2007 14:55:52 -0000	1.33
@@ -6,15 +6,16 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.2.19
-Release: 2%{?dist}
+Version: 1.2.21
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
 Source0: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/pub/%{name}-%{version}.tar.gz
 Source1: php4-svn%{php_rrd_svn}.tar.gz
 Patch0: rrdtool-1.2.13-php.patch
-Patch1: rrdtool-1.2.19-python.patch
+Patch1: rrdtool-1.2.21-tclbindings.patch
+Patch2: rrdtool-1.2.21-python.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-c++, openssl-devel, freetype-devel
 BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
@@ -113,7 +114,8 @@
 %patch0 -p0 -b .php
 %{__perl} -pi -e 's|../config.h|../rrd_config.h|g' php4/rrdtool.c
 %endif
-%patch1 -p0 -b .python
+%patch1 -p1 -b .tcl
+%patch2 -p1 -b .python
 
 # Fix to find correct python dir on lib64
 %{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
@@ -272,6 +274,9 @@
 %endif
 
 %changelog
+* Tue May 01 2007 Jarod Wilson <jwilson at redhat.com> 1.2.21-1
+- New upstream release
+
 * Wed Apr 25 2007 Jarod Wilson <jwilson at redhat.com> 1.2.19-2
 - Define %%python_version *before* its needed (#237826)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Apr 2007 14:18:07 -0000	1.15
+++ sources	2 May 2007 14:55:52 -0000	1.16
@@ -1,2 +1,2 @@
 20f70c46a3643ebc51d7b8562d8af9b2  php4-svn839.tar.gz
-df625d12e0585042a398ff946e32e3e7  rrdtool-1.2.19.tar.gz
+033343b4a9bac7539a85d82fdf8e2d0f  rrdtool-1.2.21.tar.gz


--- rrdtool-1.2.19-python.patch DELETED ---