rpms/freenx/devel fc5patch.diff, NONE, 1.1 freenx.spec, 1.3, 1.4 fc5-050nxloadconfig.diff, 1.2, NONE needs.rebuild, 1.1, NONE
Richard A. Stout (zipsonic)
fedora-extras-commits at redhat.com
Sun Sep 3 20:05:35 UTC 2006
Author: zipsonic
Update of /cvs/extras/rpms/freenx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20002/devel
Modified Files:
freenx.spec
Added Files:
fc5patch.diff
Removed Files:
fc5-050nxloadconfig.diff needs.rebuild
Log Message:
auto-import freenx-0.5.0-4.fc6 on branch devel from freenx-0.5.0-4.fc6.src.rpm
fc5patch.diff:
--- NEW FILE fc5patch.diff ---
diff -Naur freenx-0.5.0.orig/node.conf.sample freenx-0.5.0/node.conf.sample
--- freenx-0.5.0.orig/node.conf.sample 2006-07-07 20:31:35.000000000 -0700
+++ freenx-0.5.0/node.conf.sample 2006-08-27 23:30:09.000000000 -0700
@@ -300,11 +300,11 @@
# The key that contains the name of the script that starts a KDE session.
# It's run when a 'unix-kde' session is requested by the client.
-#COMMAND_START_KDE=startkde
+#COMMAND_START_KDE="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/startkde"
# The key that contains the name of the script that starts a gnome session.
# It's run when a 'unix-gnome' session is requested by the client.
-#COMMAND_START_GNOME=gnome-session
+#COMMAND_START_GNOME="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/gnome-session"
# The key that contains the name of the script that starts a CDE session.
# It's run when a 'unix-cde' session is requested by the client.
@@ -317,7 +317,7 @@
# The key that contains the name of the complete path of command name
# 'xauth'.
-#COMMAND_XAUTH=/usr/X11R6/bin/xauth
+#COMMAND_XAUTH=/usr/bin/xauth
# The key that contains the name of the complete path of command name
# 'smbmount'.
@@ -328,7 +328,7 @@
#COMMAND_SMBUMOUNT=smbumount
# The key that contains the name of the complete path of the 'netcat' command.
-#COMMAND_NETCAT=netcat
+#COMMAND_NETCAT=nc
# The key that contains the name of the complete path of the 'ssh' and
# 'ssh-keygen' command.
@@ -346,7 +346,7 @@
#########################################################################
# When you installed a 2.0.0 NX Backend, set this to 1.
-#ENABLE_2_0_0_BACKEND="0"
+#ENABLE_2_0_0_BACKEND="1"
# When set to 1 this will automatically resume started sessions
#ENABLE_AUTORECONNECT="0"
@@ -378,7 +378,7 @@
# for examples of useful parameters.
#AGENT_EXTRA_OPTIONS_RFB=""
#AGENT_EXTRA_OPTIONS_RDP=""
-#AGENT_EXTRA_OPTIONS_X=""
+#AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11"
# The number of seconds we wait for the nxagent to start before
# deciding startup has failed
diff -Naur freenx-0.5.0.orig/nxloadconfig freenx-0.5.0/nxloadconfig
--- freenx-0.5.0.orig/nxloadconfig 2006-07-07 20:31:35.000000000 -0700
+++ freenx-0.5.0/nxloadconfig 2006-08-27 23:14:02.000000000 -0700
@@ -157,8 +157,8 @@
KILL_DEFAULT_X_WM="1"
USER_X_STARTUP_SCRIPT=.Xclients
DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
-COMMAND_START_KDE=startkde
-COMMAND_START_GNOME=gnome-session
+COMMAND_START_KDE="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/startkde"
+COMMAND_START_GNOME="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/gnome-session"
COMMAND_START_CDE=cdwm
COMMAND_XTERM=xterm
COMMAND_XAUTH=/usr/X11R6/bin/xauth
@@ -173,7 +173,7 @@
# Misc directives
-ENABLE_2_0_0_BACKEND="0"
+ENABLE_2_0_0_BACKEND="1"
ENABLE_AUTORECONNECT="0"
ENABLE_AUTORECONNECT_BEFORE_140="1"
EXPORT_USERIP="0"
@@ -184,7 +184,7 @@
COMMAND_SESSREG="sessreg"
AGENT_EXTRA_OPTIONS_RFB=""
AGENT_EXTRA_OPTIONS_RDP=""
-AGENT_EXTRA_OPTIONS_X=""
+AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11"
AGENT_STARTUP_TIMEOUT="60"
AGENT_FONT_SERVER=""
PROXY_TCP_NODELAY=""
diff -Naur freenx-0.5.0.orig/nxsetup freenx-0.5.0/nxsetup
--- freenx-0.5.0.orig/nxsetup 2006-07-07 20:31:35.000000000 -0700
+++ freenx-0.5.0/nxsetup 2006-08-27 23:19:40.000000000 -0700
@@ -24,6 +24,7 @@
BUILD_KNOWN_HOSTS="yes"
AUTOMATIC="no"
IGNORE_ERRORS="no"
+OVERRIDE="no"
while [ "$1" ]
do
@@ -41,6 +42,7 @@
--uninstall) UNINSTALL="yes"; shift ;;
--purge) PURGE="yes"; shift ;;
--auto) AUTOMATIC="yes"; shift ;;
+ --override) OVERRIDE="yes"; shift ;;
--) shift ; break ;;
*) echo "Invalid flag $1" ; HELP="yes"; shift ; break ;;
esac
@@ -54,7 +56,7 @@
[ "$UNINSTALL" = "yes" -a "$CLEAN" = "yes" ] && HELP="yes"
[ "$SETUP_SSH2_KEY" = "yes" -a "$SETUP_NOMACHINE_KEY" = "no" ] && HELP="yes"
-if [ "$INSTALL" = "no" -a "$UNINSTALL" = "no" -a "$AUTOMATIC" = "no" -a "$HELP" = "no" ]
+if [ "$INSTALL" = "no" -a "$UNINSTALL" = "no" -a "$AUTOMATIC" = "no" -a "$HELP" = "no" -a "$OVERRIDE" = "yes" ]
then
echo "------> You did select no action."
echo " FreeNX guesses that you want to _install_ the server."
@@ -70,6 +72,20 @@
[ "$INSTALL" = "no" -a "$UNINSTALL" = "no" ] && HELP="yes"
+if [ "$OVERRIDE" = "no" ]
+then
+ echo "Your FreeNX server was already setup and configured by the RPM."
+ echo
+ echo "You should only need to copy the client.id_dsa.key from /etc/nxserver to your client,"
+ echo "then properly import the key into the client setup. Only proceed with nxsetup if you"
+ echo "know exactly what you are doing."
+ echo
+ echo "To bypass this message, add the following to the nxsetup arguments:"
+ echo " --override"
+ echo
+ exit 0
+fi
+
if [ "$HELP" = "yes" ]
then
echo "nxsetup - Setup the FreeNX server."
Index: freenx.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx/devel/freenx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- freenx.spec 12 Jul 2006 05:11:58 -0000 1.3
+++ freenx.spec 3 Sep 2006 20:05:34 -0000 1.4
@@ -1,15 +1,15 @@
Name: freenx
Version: 0.5.0
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: Freenx application/thin-client server
Group: Applications/Internet
License: GPL
URL: http://freenx.berlios.de
Source0: %{name}-%{version}.tar.gz
-Patch0: fc5-050nxloadconfig.diff
+Patch0: fc5patch.diff
ExcludeArch: x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssh-server nc expect xorg-x11-server-Xorg xorg-x11-apps perl
+Requires: openssh-server nc expect xorg-x11-server-Xorg xorg-x11-apps perl dbus-x11
Requires: nx >= 2.0.0
%description
@@ -22,7 +22,7 @@
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p0
+%patch0 -p1
%build
@@ -127,6 +127,12 @@
%dir %{_var}/lib/nxserver/db/failed
%changelog
+* Mon Aug 28 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-4
+- upping version for rebuild
+- added fix for nxsetup not displaying the proper message
+- updated the node.conf.sample to show the fedora defaults
+- added dbus-x11 to dependencies to fix BZ# 200756
+- added AGENXT_EXTRA_OPTIONS_X to nxloadconfig for modular x.org compat
* Sun Jul 07 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-2
- updating dependencies to have the nx 2.0.0 backend
- tweaked nxloadconfig for gnome and kde startup and nx 2.0.0 backend
--- fc5-050nxloadconfig.diff DELETED ---
--- needs.rebuild DELETED ---
More information about the fedora-extras-commits
mailing list