rpms/rrdtool/F-8 rrdtool-1.3b-fix-python-bindings-rrdtool-info.patch, NONE, 1.1 rrdtool.spec, 1.48, 1.49

[Jarod Wilson (jwilson)]

Author: jwilson

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

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-8/rrdtool.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- rrdtool.spec	5 Feb 2008 21:42:25 -0000	1.48
+++ rrdtool.spec	23 Apr 2008 18:42:43 -0000	1.49
@@ -4,21 +4,21 @@
 %define with_ruby %{?_without_ruby: 0} %{?!_without_ruby: 1}
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 %define svnrev r1190
-%define betaver beta3
-%define pretag 1.2.99907080300
+%define betaver beta4
+%define pretag 1.2.99908020600
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.3
-Release: 0.6.%{betaver}%{?dist}
-License: GPL
+Release: 0.12.%{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
-Patch0: rrdtool-1.3-beta3-text-align.patch
-Patch1: rrdtool-1.3-beta3-plug-mem-leak.patch
+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
@@ -142,8 +142,10 @@
 
 %prep
 %setup -q -n %{name}-%{pretag} %{?with_php: -a 1}
-%patch0 -p1 -b .align
-%patch1 -p1 -b .leak
+%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' \
@@ -154,6 +156,10 @@
 %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
     configure Makefile.in php4/configure php4/ltconfig*
 
+# Perl 5.10 seems to not like long version strings, hack around it
+%{__perl} -pi.orig -e 's|1.299907080300|1.29990708|' \
+    bindings/perl-shared/RRDs.pm bindings/perl-piped/RRDp.pm
+
 %build
 %configure \
     --with-perl-options='INSTALLDIRS="vendor"' \
@@ -320,6 +326,24 @@
 %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)
+
+* 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)
+
+* Wed Feb 13 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.8.beta4
+- Update to rrdtool 1.3 beta4
+
+* Tue Feb 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.3.0-0.7.beta3
+- rebuild for new perl (and fix license tag)
+
 * Mon Feb 04 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.6.beta3
 - Plug memory leak (#430879)