7128404 Xvnc package should list dependency on xauth for vncserver to work
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Fri, 16 Mar 2012 15:54:46 -0700
changeset 1259 ca852ee9121b
parent 1258 41b68bf75183
child 1260 00de6d69162d
7128404 Xvnc package should list dependency on xauth for vncserver to work
pkg/manifests/x11-server-xvnc.p5m
--- a/pkg/manifests/x11-server-xvnc.p5m	Mon Mar 12 15:01:23 2012 -0700
+++ b/pkg/manifests/x11-server-xvnc.p5m	Fri Mar 16 15:54:46 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -48,6 +48,20 @@
 legacy pkg=SUNWxvnc \
     desc="X Window System server based on X.Org Foundation open source release and TigerVNC open source release that displays over RFB protocol to a VNC client" \
     name="X11/VNC server"
+
+# Fallback vncserver session runs xterm & twm, but GNOME will be used instead
+# if installed, and customers can configure an alternate session that does
+# not require those, so these are not listed as strict requirements.
+depend type=group fmri=pkg:/desktop/window-manager/twm
+depend type=group fmri=pkg:/terminal/xterm
+
+# vncserver script requires xdpyinfo
+depend type=require fmri=pkg:/x11/diagnostic/x11-info-clients
+
 # X servers require xkbcomp & data-xkb for keyboard layouts
 depend type=require fmri=pkg:/x11/keyboard/data-xkb
 depend type=require fmri=pkg:/x11/keyboard/xkbcomp
+
+# vncserver script requires xauth & xrdb programs
+depend type=require fmri=pkg:/x11/session/xauth
+depend type=require fmri=pkg:/x11/x11-server-utilities