rpms/rrdtool/devel rrdtool-1.3-beta3-text-align.patch, NONE, 1.1 rrdtool.spec, 1.47, 1.48

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30083

Modified Files:
	rrdtool.spec 
Added Files:
	rrdtool-1.3-beta3-text-align.patch 
Log Message:
* Mon Jan 07 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.5.beta3
- Fix right-aligned text alignment and scaling (Resolves: #427609)


rrdtool-1.3-beta3-text-align.patch:

--- NEW FILE rrdtool-1.3-beta3-text-align.patch ---
Index: rrdtool/src/rrd_gfx.c
===================================================================
--- rrdtool/src/rrd_gfx.c (revision 1183)
+++ rrdtool/src/rrd_gfx.c (revision 1264)
@@ -147,5 +147,7 @@
     pango_context = pango_layout_get_context(layout);
     pango_cairo_context_set_font_options(pango_context, im->font_options);
-    pango_cairo_update_context(cr, pango_context);
+    pango_cairo_context_set_resolution(pango_context,100);
+
+/*     pango_cairo_update_context(cr, pango_context); */
 
     pango_layout_set_tabs(layout, tab_array);
Index: rrdtool/src/rrd_graph.c
===================================================================
--- rrdtool/src/rrd_graph.c (revision 1262)
+++ rrdtool/src/rrd_graph.c (revision 1264)
@@ -341,5 +341,5 @@
         cairo_surface_destroy(im->surface);
     if (status)
-        fprintf(stderr, "OOPS: Cairo has issuesm it can't even die: %s\n",
+        fprintf(stderr, "OOPS: Cairo has issues it can't even die: %s\n",
                 cairo_status_to_string(status));
 
@@ -3032,7 +3032,7 @@
     };
     im->cr = cairo_create(im->surface);
-    pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(font_map), 100);
     cairo_set_antialias(im->cr, im->graph_antialias);
     cairo_scale(im->cr, im->zoom, im->zoom);
+    pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(font_map), 100);
 
     gfx_new_area(im,


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- rrdtool.spec	2 Jan 2008 15:43:01 -0000	1.47
+++ rrdtool.spec	7 Jan 2008 16:53:33 -0000	1.48
@@ -10,13 +10,14 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.3
-Release: 0.4.%{betaver}%{?dist}
+Release: 0.5.%{betaver}%{?dist}
 License: GPL
 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dejavu-lgc-fonts
 BuildRequires: gcc-c++, openssl-devel, freetype-devel
@@ -140,6 +141,7 @@
 
 %prep
 %setup -q -n %{name}-%{pretag} %{?with_php: -a 1}
+%patch0 -p1 -b .align
 
 # 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' \
@@ -316,6 +318,9 @@
 %endif
 
 %changelog
+* Mon Jan 07 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.5.beta3
+- Fix right-aligned text alignment and scaling (Resolves: #427609)
+
 * Wed Jan 02 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.4.beta3
 - Add newly built python egg to %%files