rpms/rrdtool/EL-4 rrdtool-fix-rrd_update-in-php-bindings.patch, NONE, 1.1 rrdtool.spec, 1.14, 1.15

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9995

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


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

--- NEW FILE rrdtool-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/EL-4/rrdtool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rrdtool.spec	16 Mar 2008 22:47:55 -0000	1.14
+++ rrdtool.spec	6 Apr 2008 03:52:33 -0000	1.15
@@ -1,20 +1,21 @@
 %define with_python %{?_without_python: 0} %{?!_without_python: 1}
 %define with_php %{?_without_php: 0} %{?!_without_php: 1}
 %define with_tcl %{?_without_tcl: 0} %{?!_without_tcl: 1}
-%define with_ruby %{?_with_ruby: 1} %{?!_with_ruby: 0}
+%define with_ruby %{?_without_ruby: 0} %{?!_without_ruby: 1}
 %define php_rrd_svn 839
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
 Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
 Source1: php4-svn%{php_rrd_svn}.tar.gz
 Patch0: rrdtool-1.2.13-php.patch
+Patch1: rrdtool-fix-rrd_update-in-php-bindings.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
@@ -130,6 +131,7 @@
 # Patch based on http://oss.oetiker.ch/rrdtool/pub/contrib/php_rrdtool.tgz
 %if %{with_php}
 %patch0 -p0 -b .php
+%patch1 -p1 -b .rrd_update
 %{__perl} -pi -e 's|../config.h|../rrd_config.h|g' php4/rrdtool.c
 %endif
 
@@ -300,13 +302,31 @@
 %endif
 
 %changelog
+* Sat Apr 05 2008 Jarod Wilson <jwilson at redhat.com> 1.2.27-3
+- Fix use of rrd_update in php bindings (#437558)
+
 * Sat Mar 15 2008 Jarod Wilson <jwilson at redhat.com> 1.2.27-2
-- Drop php abi stuff, apparently not wired up in el4
+- Drop php abi stuff, apparently not wired up in el5
 - Turn ppc64 php bits back on
 
 * Mon Feb 25 2008 Jarod Wilson <jwilson at redhat.com> 1.2.27-1
 - New upstream release, v1.2.27
 
+* Tue Jul 10 2007 Jarod Wilson <jwilson at redhat.com> 1.2.23-6
+- Add php abi check (#247339)
+
+* Mon May 21 2007 Jarod Wilson <jwilson at redhat.com> 1.2.23-5
+- BR: ruby so %%ruby_sitearch gets set
+
+* Mon May 21 2007 Jarod Wilson <jwilson at redhat.com> 1.2.23-4
+- Build ruby bindings
+
+* Thu May 03 2007 Jarod Wilson <jwilson at redhat.com> 1.2.23-3
+- Disable php bits on ppc64 for now, they fail to build
+
+* Thu May 03 2007 Jarod Wilson <jwilson at redhat.com> 1.2.23-2
+- Add BR: perl-devel for Fedora 7 and later
+
 * Tue May 01 2007 Jarod Wilson <jwilson at redhat.com> 1.2.23-1
 - New upstream release