From beb09658fba45c790a0b102b5ec0d92f3eaca428 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 22 Jan 2007 22:36:53 +0000
Subject: [PATCH] New upstream release, v1.2.17

---
 .cvsignore   |  1 +
 rrdtool.spec | 11 +++--------
 sources      |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 942eb2f..8e57861 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ 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
diff --git a/rrdtool.spec b/rrdtool.spec
index 864cf97..8d57408 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -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.17
+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 @@ The %{name}-tcl package includes RRDtool bindings for Tcl.
 # 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' \
diff --git a/sources b/sources
index e9bcac6..6603120 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 20f70c46a3643ebc51d7b8562d8af9b2  php4-svn839.tar.gz
-bde8b12c202bc4e27fb9a9588a0aaddf  rrdtool-1.2.15.tar.gz
+ac743fc7f58a195854fff9d70517b193  rrdtool-1.2.17.tar.gz