[gnuplot/f14/master] Resolves: #537960 Could not find/open font when opening font "arial"

[Ivana Varekova]

commit 5d12e3db71140a21c22b540b33ba675821d332e1
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date:   Tue Aug 17 11:36:54 2010 +0200

    Resolves: #537960
     Could not find/open font when opening font "arial"

 gnuplot-4.2.0-fonts.patch |   12 ++++++++++++
 gnuplot.spec              |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/gnuplot-4.2.0-fonts.patch b/gnuplot-4.2.0-fonts.patch
new file mode 100644
index 0000000..2b197a0
--- /dev/null
+++ b/gnuplot-4.2.0-fonts.patch
@@ -0,0 +1,12 @@
+diff -up gnuplot-4.4.0/term/gd.trm.pom gnuplot-4.4.0/term/gd.trm
+--- gnuplot-4.4.0/term/gd.trm.pom	2010-02-25 03:29:20.000000000 +0100
++++ gnuplot-4.4.0/term/gd.trm	2010-08-17 09:51:22.000000000 +0200
+@@ -978,7 +978,7 @@ PNG_options()
+ 	if (external_default)
+ 		png_state.ttffont = gp_strdup(external_default);
+ 	else	/* Might as well try some plausible font; it's no worse than failing immediately */
+-		png_state.ttffont = gp_strdup("arial");
++		png_state.ttffont = gp_strdup("/usr/share/fonts/dejavu/DejaVuSans.ttf");
+ 
+ 	free(png_state.default_ttffont);
+ 	png_state.default_ttffont = gp_strdup(png_state.ttffont);
diff --git a/gnuplot.spec b/gnuplot.spec
index 2e5ab5b..751b73a 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -7,7 +7,7 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Modifications are to be distributed as patches to the released version.
 # aglfn.txt has license: MIT
 License: gnuplot and MIT
@@ -16,10 +16,12 @@ URL: http://www.gnuplot.info/
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source2: gnuplot-init.el
 Patch1: gnuplot-4.2.0-refers_to.patch
+Patch2: gnuplot-4.2.0-fonts.patch
 BuildRequires: libpng-devel, tex(latex), zlib-devel, libX11-devel, emacs
 BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel, wxGTK-devel
 BuildRequires: latex2html
 Requires: %{name}-common = %{version}-%{release}
+Requires: dejavu-sans-fonts
 Requires(post): %{_sbindir}/alternatives
 Requires(preun): %{_sbindir}/alternatives
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -114,6 +116,7 @@ plotting tool.
 %prep
 %setup -q
 %patch1 -p1 -b .refto
+%patch2 -p1 -b .font
 sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c
 iconv -f windows-1252 -t utf-8 ChangeLog > ChangeLog.aux
 mv ChangeLog.aux ChangeLog
@@ -252,6 +255,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/texmf/tex/latex/gnuplot/gnuplot-lua-tikz.sty
 
 %changelog
+* Tue Aug 17 2010 Ivana Hutarova Varekova <varekova at redhat.com> 4.4.0-5
+- Resolves: #537960
+  Could not find/open font when opening font "arial"
+
 * Wed Jul 14 2010 Dan Horák <dan at danny.cz> - 4.4.0-4
 - rebuilt against wxGTK-2.8.11-2