rpms/rrdtool/FC-6 .cvsignore, 1.9, 1.10 rrdtool.spec, 1.26, 1.27 sources, 1.12, 1.13

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
New upstream release 1.2.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	17 Jul 2006 13:58:25 -0000	1.9
+++ .cvsignore	30 Jan 2007 22:36:15 -0000	1.10
@@ -2,3 +2,5 @@
 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


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-6/rrdtool.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rrdtool.spec	2 Jan 2007 18:06:10 -0000	1.26
+++ rrdtool.spec	30 Jan 2007 22:36:15 -0000	1.27
@@ -6,17 +6,14 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.2.15
-Release: 9%{?dist}
+Version: 1.2.18
+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
 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 +109,8 @@
 # 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
 
 # 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 +269,12 @@
 %endif
 
 %changelog
+* 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-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Aug 2006 19:58:19 -0000	1.12
+++ sources	30 Jan 2007 22:36:15 -0000	1.13
@@ -1,2 +1,2 @@
 20f70c46a3643ebc51d7b8562d8af9b2  php4-svn839.tar.gz
-bde8b12c202bc4e27fb9a9588a0aaddf  rrdtool-1.2.15.tar.gz
+0c116d031275b7e0da1f8326d52d097d  rrdtool-1.2.18.tar.gz