rpms/rrdtool/FC-5 rrdtool-1.2.19-python.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 rrdtool.spec, 1.26, 1.27 sources, 1.9, 1.10

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21510

Modified Files:
	.cvsignore rrdtool.spec sources 
Added Files:
	rrdtool-1.2.19-python.patch 
Log Message:
Update to rrdtool v1.2.19

rrdtool-1.2.19-python.patch:

--- NEW FILE rrdtool-1.2.19-python.patch ---
diff -uNr bindings/python-orig/Makefile.am bindings/python/Makefile.am
--- bindings/python-orig/Makefile.am	2007-03-31 11:21:43.000000000 +0100
+++ bindings/python/Makefile.am	2007-03-31 11:24:47.000000000 +0100
@@ -2,6 +2,7 @@
 
 pyexec_PROGRAMS = rrdtoolmodule.so
 
+rrdtoolmodule_so_LDFLAGS = -module -shared
 rrdtoolmodule_so_LDADD = $(top_builddir)/src/librrd.la
 rrdtoolmodule_so_SOURCES = rrdtoolmodule.c
 
diff -uNr bindings/python-orig/Makefile.in bindings/python/Makefile.in
--- bindings/python-orig/Makefile.in	2007-03-31 11:21:43.000000000 +0100
+++ bindings/python/Makefile.in	2007-03-31 11:22:14.000000000 +0100
@@ -233,6 +233,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 AM_CPPFLAGS = @CFLAGS@ -I$(top_srcdir)/src @PYTHON_INCLUDES@
+rrdtoolmodule_so_LDFLAGS = -module -shared
 rrdtoolmodule_so_LDADD = $(top_builddir)/src/librrd.la
 rrdtoolmodule_so_SOURCES = rrdtoolmodule.c
 noinst_HEADERS = rrd_extra.h


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Jul 2006 13:58:24 -0000	1.7
+++ .cvsignore	9 Apr 2007 14:47:00 -0000	1.8
@@ -1,5 +1,7 @@
-rrdtool-1.0.49.tar.gz
-rrdtool-1.0.50.tar.gz
+rrdtool-1.2.12.tar.gz
 rrdtool-1.2.13.tar.gz
 php4-svn839.tar.gz
 rrdtool-1.2.15.tar.gz
+rrdtool-1.2.17.tar.gz
+rrdtool-1.2.18.tar.gz
+rrdtool-1.2.19.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/rrdtool.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rrdtool.spec	2 Jan 2007 18:06:54 -0000	1.26
+++ rrdtool.spec	9 Apr 2007 14:47:00 -0000	1.27
@@ -6,17 +6,15 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.2.15
-Release: 9%{?dist}
+Version: 1.2.19
+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.15-initrrdtool.patch
-Patch2: rrdtool-1.2.15-log_grid_leak.patch
-Patch3: rrdtool-1.2.15-long_error_string.patch
+Patch1: rrdtool-1.2.19-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
@@ -112,10 +110,9 @@
 # Patch based on http://oss.oetiker.ch/rrdtool/pub/contrib/php_rrdtool.tgz
 %if %{with_php}
 %patch0 -p0 -b .php
+%{__perl} -pi -e 's|../config.h|../rrd_config.h|g' php4/rrdtool.c
 %endif
-%patch1 -p1 -b .initrrdtool
-%patch2 -p1 -b .leak
-%patch3 -p1 -b .longstring
+%patch1 -p0 -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' \
@@ -274,6 +271,15 @@
 %endif
 
 %changelog
+* Mon Apr 09 2007 Jarod Wilson <jwilson at redhat.com> 1.2.19-1
+- New upstream release
+
+* Tue Jan 23 2007 Jarod Wilson <jwilson at redhat.com> 1.2.18-1
+- New upstream release
+
+* Mon Jan 22 2007 Jarod Wilson <jwilson at redhat.com> 1.2.17-1
+- New upstream release
+
 * Tue Jan 02 2007 Jarod Wilson <jwilson at redhat.com> 1.2.15-9
 - Fix crash with long error strings (upstream
   changesets 929 and 935)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Aug 2006 19:58:13 -0000	1.9
+++ sources	9 Apr 2007 14:47:00 -0000	1.10
@@ -1,2 +1,2 @@
 20f70c46a3643ebc51d7b8562d8af9b2  php4-svn839.tar.gz
-bde8b12c202bc4e27fb9a9588a0aaddf  rrdtool-1.2.15.tar.gz
+df625d12e0585042a398ff946e32e3e7  rrdtool-1.2.19.tar.gz