rpms/gnuplot/devel gnuplot-4.0.0-refers_to.patch, NONE, 1.1 gnuplot.spec, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Author: varekova

Update of /cvs/dist/rpms/gnuplot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22815

Modified Files:
	gnuplot.spec 
Added Files:
	gnuplot-4.0.0-refers_to.patch 
Log Message:
- Resolves: 173752 - gnuplot refers to /usr/X11R6/lib/fonts/Type1


gnuplot-4.0.0-refers_to.patch:
 variable.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnuplot-4.0.0-refers_to.patch ---
--- 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 */


Index: gnuplot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnuplot.spec	21 Dec 2006 11:23:29 -0000	1.30
+++ gnuplot.spec	22 Dec 2006 08:29:05 -0000	1.31
@@ -1,12 +1,13 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: 4.0.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: Redistributable, with restrictions
 Group: Applications/Engineering
 Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source2: gnuplot-init.el
 Patch0: gnuplot-4.0.0-x11segv.patch
+Patch1: gnuplot-4.0.0-refers_to.patch
 BuildRequires: libpng-devel, tetex-latex, zlib-devel, libX11-devel, emacs
 BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel
 Requires: libpng
@@ -34,6 +35,7 @@
 %prep
 %setup -q
 %patch0 -p 1 -b .x11segv
+%patch1 -p1 -b .refto
 
 %build
 %configure --with-readline=gnu --with-png --without-linux-vga \
@@ -92,7 +94,10 @@
 
 
 %changelog
-* Tue Dec 21 2006 Ivana Varekova <varekova at redhat.com> -4.0.0-14
+* Fri Dec 22 2006 Ivana Varekova <varekova at redhat.com> - 4.0.0-15
+- Resolves: 173752 - gnuplot refers to /usr/X11R6/lib/fonts/Type1
+
+* Tue Dec 21 2006 Ivana Varekova <varekova at redhat.com> - 4.0.0-14
 - remove --without-gd options (#173922, #172565)
 - spec file cleanup