rpms/vnc/devel vnc-fontpath.patch,NONE,1.1 vnc.spec,1.93,1.94

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12268

Modified Files:
	vnc.spec 
Added Files:
	vnc-fontpath.patch 
Log Message:
* Fri Nov 18 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-20
- Fix font path correctly (bug #173160).


vnc-fontpath.patch:
 X11.tmpl |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vnc-fontpath.patch ---
--- vnc-4_1_1-unixsrc/unix/xc/config/cf/X11.tmpl.fontpath	2005-11-18 10:04:36.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/xc/config/cf/X11.tmpl	2005-11-18 11:15:15.000000000 +0000
@@ -1517,7 +1517,7 @@
 #define DocPdfDir $(DOCDIR)/PDF
 #endif
 #ifndef FontDir
-#define FontDir $(LIBDIR)/fonts
+#define FontDir /usr/share/X11/fonts
 #endif
 #ifndef AdmDir
 #define AdmDir /usr/adm


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- vnc.spec	16 Nov 2005 10:58:32 -0000	1.93
+++ vnc.spec	18 Nov 2005 11:56:15 -0000	1.94
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.1
-Release: 19
+Release: 20
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -30,6 +30,7 @@
 Patch12:   vnc-nohttpd.patch
 Patch13:   vnc-xorg-x11-fixes.patch
 Patch14:   vnc-xscreensaver.patch
+Patch15:   vnc-fontpath.patch
 License:   GPL
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -82,6 +83,7 @@
 %patch12 -p1 -b .nohttpd
 %patch13 -p1 -b .xorg-x11-fixes
 %patch14 -p1 -b .xscreensaver
+%patch15 -p1 -b .fontpath
 
 # Apply the patch from the VNC tarball.
 pushd unix
@@ -89,9 +91,6 @@
 #patch -p0 -i xc.patch
 popd
 
-find -type f | xargs grep -Fl --binary-files=without-match --mmap X11R6 | \
-	xargs sed -i.X11R6 -e 's,X11R6,X11R7,g'
-
 %build
 cd unix
 autoconf # For use-fb patch
@@ -223,6 +222,9 @@
 /usr/X11R6
 
 %changelog
+* Fri Nov 18 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-20
+- Fix font path correctly (bug #173160).
+
 * Wed Nov 16 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-19
 - Remove xorg-x11-devel build requirement to see what breaks.
 - Hack font paths (bug #173160).