From 72617c05303d18dfba440a6c326a142b8fe217bd Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Thu, 6 Sep 2007 09:14:15 +0000
Subject: [PATCH] - change font paths, change documenatation

---
 gnuplot-4.0.0-refers_to.patch | 13 -------------
 gnuplot-4.2.0-refers_to.patch | 14 ++++++++++++++
 gnuplot.spec                  | 14 ++++++++------
 3 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 100644 gnuplot-4.0.0-refers_to.patch
 create mode 100644 gnuplot-4.2.0-refers_to.patch

diff --git a/gnuplot-4.0.0-refers_to.patch b/gnuplot-4.0.0-refers_to.patch
deleted file mode 100644
index b8f4f58..0000000
--- a/gnuplot-4.0.0-refers_to.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnuplot-4.0.0/src/variable.c.pom	2004-04-13 19:24:03.000000000 +0200
-+++ gnuplot-4.0.0/src/variable.c	2006-12-22 09:20:06.000000000 +0100
-@@ -257,8 +257,8 @@
-     { "$`kpsexpand '$TEXMFMAIN'`/fonts/type1!" },
-     { "$`kpsexpand '$TEXMFLOCAL'`/fonts/type1!" },
-     /* Linux paths */
--    { "/usr/X11R6/lib/X11/fonts/Type1" },
--    { "/usr/X11R6/lib/X11/fonts/truetype" },
-+    { "/usr/share/X11/fonts/Type1" },
-+    { "/usr/share/X11/fonts/TTF" },
-     /* HP-UX */
-     { "/usr/lib/X11/fonts!"},
-     /* Ghostscript */
diff --git a/gnuplot-4.2.0-refers_to.patch b/gnuplot-4.2.0-refers_to.patch
new file mode 100644
index 0000000..6d41d8b
--- /dev/null
+++ b/gnuplot-4.2.0-refers_to.patch
@@ -0,0 +1,14 @@
+--- gnuplot-4.2.0/src/variable.c.refto	2006-06-27 04:36:30.000000000 +0200
++++ gnuplot-4.2.0/src/variable.c	2007-09-06 10:02:54.000000000 +0200
+@@ -263,8 +263,9 @@ static const struct path_table fontpath_
+     { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
+ #endif
+     /* Linux paths */
+-    { "/usr/X11R6/lib/X11/fonts/Type1" },
+-    { "/usr/X11R6/lib/X11/fonts/truetype" },
++    { "/usr/share/fonts/default/ghostscript/" },
++    { "/usr/share/fonts/default/Type1/" },
++    { "/usr/share/fonts/bitstream-vera/" },
+     /* HP-UX */
+     { "/usr/lib/X11/fonts!"},
+     /* Ghostscript */
diff --git a/gnuplot.spec b/gnuplot.spec
index 212680d..279265a 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -5,13 +5,13 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source2: gnuplot-init.el
-Patch1: gnuplot-4.0.0-refers_to.patch
+Patch1: gnuplot-4.2.0-refers_to.patch
 Patch2: gnuplot-4.2.0-ver.patch
 BuildRequires: libpng-devel, tetex-latex, zlib-devel, libX11-devel, emacs
 BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel
@@ -53,6 +53,7 @@ cd docs
 make html
 cd psdoc
 make 
+make ps_symbols.ps ps_fontfile_doc.pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,8 +76,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc BUGS ChangeLog Copyright FAQ NEWS README TODO 
-#docs/gnuplot.html 
-%doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.gpi tutorial/tutorial.dvi demo
+%doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps tutorial/tutorial.dvi demo docs/psdoc/ps_file.doc 
+%doc docs/psdoc/ps_fontfile_doc.pdf
 %dir %{_libexecdir}/gnuplot
 %dir %{_libexecdir}/gnuplot/%{major}.%{minor}
 %{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11
@@ -97,12 +98,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/emacs/site-lisp/gnuplot-gui.elc
 %{_datadir}/emacs/site-lisp/gnuplot.el
 %{_datadir}/emacs/site-lisp/gnuplot.elc
-#%{_datadir}/emacs/site-lisp/info-look.20.2.el
-#%{_datadir}/emacs/site-lisp/info-look.20.3.el
 %{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 
 
 %changelog
+* Thu Sep  6 2007 Ivana Varekova <varekova@redhat.com> - 4.2.0-4
+- change font paths, change documenatation
+
 * Tue Aug 28 2007 Ivana Varekova <varekova@redhat.com> - 4.2.0-3
 - Rebuild for selinux ppc32 issue.
 - Remove obsolete file