rpms/vnc/FC-6 vnc-config.patch,NONE,1.1 vnc.spec,1.148,1.149

[fedora-cvs-commits at redhat.com]

Author: atkac

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

Modified Files:
	vnc.spec 
Added Files:
	vnc-config.patch 
Log Message:
Fixed vncconfig crash on x64 (#179635) and added xorg-x11-fonts-base dependency


vnc-config.patch:
 vncExtInit.cc |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vnc-config.patch ---
--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc.config	2006-10-25 12:35:00.000000000 +0200
+++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc	2006-10-25 12:35:24.000000000 +0200
@@ -17,6 +17,7 @@
  */
 
 #include <stdio.h>
+#include "XserverDesktop.h"
 
 extern "C" {
 #define class c_class
@@ -48,7 +49,6 @@
 #undef min
 #include <network/TcpSocket.h>
 
-#include "XserverDesktop.h"
 #include "vncHooks.h"
 #include "vncExtInit.h"
 


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/FC-6/vnc.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- vnc.spec	24 Oct 2006 07:04:40 -0000	1.148
+++ vnc.spec	25 Oct 2006 13:02:40 -0000	1.149
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.2
-Release:   4%{?dist}
+Release:   5%{?dist}
 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
@@ -40,6 +40,7 @@
 Patch22:   vnc-188169.patch
 Patch23:   vnc-210617.patch
 Patch24:   vnc-102434.patch
+Patch25:   vnc-config.patch
 License:   GPL
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -71,7 +72,7 @@
 
 %package server
 Summary: A VNC server.
-Requires: bash >= 2.0, /usr/bin/mcookie
+Requires: bash >= 2.0, /usr/bin/mcookie, xorg-x11-fonts-base
 Group: User Interface/X
 Prereq: /sbin/chkconfig /etc/init.d
 
@@ -112,6 +113,7 @@
 %patch22 -p1 -b .fix
 %patch23 -p1 -b .ipv6
 %patch24 -p1 -b .102434
+%patch25 -p1 -b .config
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -273,6 +275,10 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Wed Oct 25 2006 Adam Tkac <atkac at redhat.com> 4.1.2-5
+- Fixed vncconfig crash on x64 (#179635)
+- added xorg-x11-fonts-base dependency
+
 * Tue Oct 24 2006 Adam Tkac <atkac at redhat.com> - 4.1.2-4
 - IPv6 support to vncviewer has been added (#210617)
 - fixed conflict between "locate pointer" option in control-center