Accepting request 207480 from devel:languages:python

- Fix bnc#793636 almost undistinguishable wheter there is "no data"
  or "zero valued data" on the rendered graph - rrdtool-zero_vs_nothing.patch  
- I did this to prepare rrdtool for SLE12 - bnc#831773 - [openSUSE goes SLE12]: rrdtool: Change and/or patches may have been lost

OBS-URL: https://build.opensuse.org/request/show/207480
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rrdtool?expand=0&rev=52

rrdtool-zero_vs_nothing.patch

@@ -0,0 +1,29 @@
+Index: rrdtool-1.4.7/src/rrd_gfx.c
+===================================================================
+--- rrdtool-1.4.7.orig/src/rrd_gfx.c
++++ rrdtool-1.4.7/src/rrd_gfx.c
+@@ -293,10 +293,10 @@ void gfx_line_fit(
+     line_width = cairo_get_line_width(cr);
+     line_height = line_width;
+     cairo_user_to_device_distance(cr, &line_width, &line_height);
+-    line_width = line_width / 2.0 - ceil(line_width / 2.0);
+-    line_height = line_height / 2.0 - ceil(line_height / 2.0);
+-    *x = floor(*x - 0.5) - line_width;
+-    *y = ceil(*y + 0.5) + line_height;
++    line_width = line_width / 2.0 - (long) (line_width / 2.0);
++    line_height = line_height / 2.0 - (long) (line_height / 2.0);
++    *x = (double) ((long) (*x + 0.5)) - line_width;
++    *y = (double) ((long) (*y + 0.5)) + line_height;
+     cairo_device_to_user(cr, x, y);
+ }
+ 
+@@ -312,7 +312,7 @@ void gfx_area_fit(
+     if (!im->gridfit)
+         return;
+     cairo_user_to_device(cr, x, y);
+-    *x = floor(*x);
+-    *y = ceil(*y);
++    *x = (double) ((long) (*x + 0.5));
++    *y = (double) ((long) (*y + 0.5));
+     cairo_device_to_user(cr, x, y);
+ }

rrdtool.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Nov 18 11:33:36 UTC 2013 - vdziewiecki@suse.com
+
+- Fix bnc#793636 almost undistinguishable wheter there is "no data"
+  or "zero valued data" on the rendered graph - rrdtool-zero_vs_nothing.patch  
+- I did this to prepare rrdtool for SLE12 - bnc#831773 - [openSUSE goes SLE12]: rrdtool: Change and/or patches may have been lost
+
+
 -------------------------------------------------------------------
 Fri Oct  4 17:01:23 UTC 2013 - p.drouand@gmail.com
 

rrdtool.spec

@@ -46,6 +46,8 @@ Patch2:         rrdtool-tclversion.patch
 Patch3:         rrdtool-tclsegfault.patch
 Source1:        http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Patch11:        cgilib-fix_automake.patch
+#PATCH FIX UPSTREAM BNC#793636
+Patch12:        rrdtool-zero_vs_nothing.patch
 Source2:        sysconfig.rrdcached
 Source4:        rrdcached-systemd-pre
 Source5:        rrdcached.service
@@ -153,6 +155,7 @@ daemon was written to alleviate these problems.
 pushd "cgilib-%{cgilib_version}"
 %patch11
 popd #cgilib
+%patch12 -p1
 
 %build
 # first prepare cgilib