- Update to rrdtool 1.3 rc9
- Minor spec tweaks to permit building on older EL
This commit is contained in:
Jarod Wilson
parent
4c4ed1b1ec
commit
12e54b5ec7
@ -1,2 +1,2 @@
|
||||
rrdtool-1.3rc7.tar.gz
|
||||
php4-r1190.tar.gz
|
||||
rrdtool-1.3rc9.tar.gz
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
diff -Naurp rrdtool-1.2.99908020600/src/rrd_graph.c rrdtool-1.2.99908020600.fix/src/rrd_graph.c
|
||||
--- rrdtool-1.2.99908020600/src/rrd_graph.c 2008-02-05 19:14:25.000000000 -0500
|
||||
+++ rrdtool-1.2.99908020600.fix/src/rrd_graph.c 2008-04-30 21:12:13.000000000 -0400
|
||||
@@ -3345,34 +3345,36 @@ int graph_paint(
|
||||
switch (im->gdes[i].gf) {
|
||||
case GF_HRULE:
|
||||
if (im->gdes[i].yrule >= im->minval
|
||||
- && im->gdes[i].yrule <= im->maxval)
|
||||
- cairo_save(im->cr);
|
||||
- if (im->gdes[i].dash) {
|
||||
- cairo_set_dash(im->cr, im->gdes[i].p_dashes,
|
||||
- im->gdes[i].ndash, im->gdes[i].offset);
|
||||
- }
|
||||
- gfx_line(im,
|
||||
- im->xorigin, ytr(im, im->gdes[i].yrule),
|
||||
- im->xorigin + im->xsize, ytr(im,
|
||||
- im->gdes[i].yrule),
|
||||
- 1.0, im->gdes[i].col);
|
||||
- cairo_stroke(im->cr);
|
||||
- cairo_restore(im->cr);
|
||||
+ && im->gdes[i].yrule <= im->maxval) {
|
||||
+ cairo_save(im->cr);
|
||||
+ if (im->gdes[i].dash) {
|
||||
+ cairo_set_dash(im->cr, im->gdes[i].p_dashes,
|
||||
+ im->gdes[i].ndash, im->gdes[i].offset);
|
||||
+ }
|
||||
+ gfx_line(im,
|
||||
+ im->xorigin, ytr(im, im->gdes[i].yrule),
|
||||
+ im->xorigin + im->xsize, ytr(im,
|
||||
+ im->gdes[i].yrule),
|
||||
+ 1.0, im->gdes[i].col);
|
||||
+ cairo_stroke(im->cr);
|
||||
+ cairo_restore(im->cr);
|
||||
+ }
|
||||
break;
|
||||
case GF_VRULE:
|
||||
if (im->gdes[i].xrule >= im->start
|
||||
- && im->gdes[i].xrule <= im->end)
|
||||
- cairo_save(im->cr);
|
||||
- if (im->gdes[i].dash) {
|
||||
- cairo_set_dash(im->cr, im->gdes[i].p_dashes,
|
||||
- im->gdes[i].ndash, im->gdes[i].offset);
|
||||
- }
|
||||
- gfx_line(im,
|
||||
- xtr(im, im->gdes[i].xrule), im->yorigin,
|
||||
- xtr(im, im->gdes[i].xrule),
|
||||
- im->yorigin - im->ysize, 1.0, im->gdes[i].col);
|
||||
- cairo_stroke(im->cr);
|
||||
- cairo_restore(im->cr);
|
||||
+ && im->gdes[i].xrule <= im->end) {
|
||||
+ cairo_save(im->cr);
|
||||
+ if (im->gdes[i].dash) {
|
||||
+ cairo_set_dash(im->cr, im->gdes[i].p_dashes,
|
||||
+ im->gdes[i].ndash, im->gdes[i].offset);
|
||||
+ }
|
||||
+ gfx_line(im,
|
||||
+ xtr(im, im->gdes[i].xrule), im->yorigin,
|
||||
+ xtr(im, im->gdes[i].xrule),
|
||||
+ im->yorigin - im->ysize, 1.0, im->gdes[i].col);
|
||||
+ cairo_stroke(im->cr);
|
||||
+ cairo_restore(im->cr);
|
||||
+ }
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -1,36 +0,0 @@
|
||||
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) \
|
||||
13
rrdtool.spec
13
rrdtool.spec
@ -4,13 +4,13 @@
|
||||
%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 pre rc7
|
||||
%define pre rc9
|
||||
#define pretag 1.2.99908020600
|
||||
|
||||
Summary: Round Robin Database Tool to store and display time-series data
|
||||
Name: rrdtool
|
||||
Version: 1.3
|
||||
Release: 0.19%{?pre:.%{pre}}%{?dist}
|
||||
Release: 0.20%{?pre:.%{pre}}%{?dist}
|
||||
License: GPLv2+ with exceptions
|
||||
Group: Applications/Databases
|
||||
URL: http://oss.oetiker.ch/rrdtool/
|
||||
@ -21,10 +21,13 @@ 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
|
||||
BuildRequires: libpng-devel, zlib-devel, cairo-devel, pango-devel
|
||||
BuildRequires: libpng-devel, zlib-devel, intltool >= 0.35.0
|
||||
BuildRequires: cairo-devel >= 1.4.6, pango-devel >= 1.17
|
||||
BuildRequires: libtool, groff
|
||||
BuildRequires: gettext, libxml2-devel
|
||||
%if 0%{?fedora} >= 7
|
||||
BuildRequires: perl-ExtUtils-MakeMaker perl-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
RRD is the Acronym for Round Robin Database. RRD is a system to store and
|
||||
@ -326,6 +329,10 @@ find examples/ -type f -exec chmod 0644 {} \;
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sun Jun 08 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.20.rc9
|
||||
- Update to rrdtool 1.3 rc9
|
||||
- Minor spec tweaks to permit building on older EL
|
||||
|
||||
* Wed Jun 04 2008 Chris Ricker <kaboom@oobleck.net> 1.3-0.19.rc7
|
||||
- Update to rrdtool 1.3 rc7
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user