rpms/rrdtool/F-9 rrdtool-1.3b-fix-python-bindings-rrdtool-info.patch, NONE, 1.1 rrdtool.spec, 1.55, 1.56

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253

Modified Files:
	rrdtool.spec 
Added Files:
	rrdtool-1.3b-fix-python-bindings-rrdtool-info.patch 
Log Message:
* Wed Apr 23 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.12.beta4
- Fix python bindings rrdtool info implementation (#435468)


rrdtool-1.3b-fix-python-bindings-rrdtool-info.patch:

--- NEW FILE rrdtool-1.3b-fix-python-bindings-rrdtool-info.patch ---
Index: rrdtool/bindings/python/rrd_extra.h
===================================================================
--- rrdtool/bindings/python/rrd_extra.h (revision 1306)
+++ rrdtool/bindings/python/rrd_extra.h (revision 1332)
@@ -54,5 +54,4 @@
     int       rrd_open(
     char *file_name,
-    FILE ** in_file,
     rrd_t *rrd,
     int rdwr);
Index: rrdtool/bindings/python/rrdtoolmodule.c
===================================================================
--- rrdtool/bindings/python/rrdtoolmodule.c (revision 1306)
+++ rrdtool/bindings/python/rrdtoolmodule.c (revision 1332)
@@ -412,5 +412,4 @@
     PyObject *r, *t, *ds;
     rrd_t     rrd;
-    FILE     *in_file;
     char     *filename;
     unsigned long i, j;
@@ -419,10 +418,9 @@
         return NULL;
 
-    if (rrd_open(filename, &in_file, &rrd, RRD_READONLY) == -1) {
-        PyErr_SetString(ErrorObject, rrd_get_error());
-        rrd_clear_error();
-        return NULL;
-    }
-    fclose(in_file);
+    if (!rrd_open(filename, &rrd, RRD_READONLY) == -1) {
+        PyErr_SetString(ErrorObject, rrd_get_error());
+        rrd_clear_error();
+        return NULL;
+    }
 
 #define DICTSET_STR(dict, name, value) \


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/rrdtool.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- rrdtool.spec	8 Apr 2008 15:19:45 -0000	1.55
+++ rrdtool.spec	23 Apr 2008 18:36:51 -0000	1.56
@@ -18,6 +18,7 @@
 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
+Patch2: rrdtool-1.3b-fix-python-bindings-rrdtool-info.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dejavu-lgc-fonts
 BuildRequires: gcc-c++, openssl-devel, freetype-devel
@@ -144,6 +145,7 @@
 %if %{with_php}
 %patch1 -p1
 %endif
+%patch2 -p1
 
 # 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' \
@@ -324,6 +326,9 @@
 %endif
 
 %changelog
+* Wed Apr 23 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.12.beta4
+- Fix python bindings rrdtool info implementation (#435468)
+
 * Tue Apr 08 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.11.beta4
 - Work around apparent version string length issue w/perl 5.10 (#441359)