rpms/rrdtool/devel rrdtool-1.3.0-beta4-fix-rrd_update-in-php-bindings.patch, NONE, 1.1 rrdtool.spec, 1.53, 1.54

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	rrdtool.spec 
Added Files:
	rrdtool-1.3.0-beta4-fix-rrd_update-in-php-bindings.patch 
Log Message:
* Sat Apr 05 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.10.beta4
- Fix use of rrd_update in php bindings (#437558)


rrdtool-1.3.0-beta4-fix-rrd_update-in-php-bindings.patch:

--- NEW FILE rrdtool-1.3.0-beta4-fix-rrd_update-in-php-bindings.patch ---
diff -Naurp rrdtool.orig/php4/rrdtool.c rrdtool/php4/rrdtool.c
--- rrdtool.orig/php4/rrdtool.c	2007-06-16 01:32:23.000000000 -0400
+++ rrdtool/php4/rrdtool.c	2008-04-05 23:37:04.000000000 -0400
@@ -381,7 +381,7 @@ PHP_FUNCTION(rrd_update)
 		argv[3] = estrdup(opt->value.str.val);
 
 		optind = 0; opterr = 0;
-		if ( rrd_update(3, &argv[1]) != -1 )
+		if ( rrd_update(2, &argv[2]) != -1 )
 		{
 			RETVAL_TRUE;
 		}


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- rrdtool.spec	3 Mar 2008 20:49:37 -0000	1.53
+++ rrdtool.spec	6 Apr 2008 03:41:21 -0000	1.54
@@ -10,13 +10,14 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.3
-Release: 0.9.%{betaver}%{?dist}
+Release: 0.10.%{betaver}%{?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
 Source0: http://oss.oetiker.ch/rrdtool/pub/beta/%{name}-%{version}%{betaver}.tar.gz
 Source1: php4-%{svnrev}.tar.gz
+Patch1: rrdtool-1.3.0-beta4-fix-rrd_update-in-php-bindings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dejavu-lgc-fonts
 BuildRequires: gcc-c++, openssl-devel, freetype-devel
@@ -140,6 +141,9 @@
 
 %prep
 %setup -q -n %{name}-%{pretag} %{?with_php: -a 1}
+%if %{with_php}
+%patch1 -p1
+%endif
 
 # 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' \
@@ -316,6 +320,9 @@
 %endif
 
 %changelog
+* Sat Apr 05 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.10.beta4
+- Fix use of rrd_update in php bindings (#437558)
+
 * Mon Mar  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.3.0-0.9.beta4
 - rebuild for new perl (again)