rpms/freenx/FC-5 fc5-050nxloadconfig.diff, 1.2, 1.3 freenx.spec, 1.8, 1.9
Richard A. Stout (zipsonic)
fedora-extras-commits at redhat.com
Wed Jul 12 05:10:47 UTC 2006
Author: zipsonic
Update of /cvs/extras/rpms/freenx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12564/FC-5
Modified Files:
fc5-050nxloadconfig.diff freenx.spec
Log Message:
auto-import freenx-0.5.0-2.fc5 on branch FC-5 from freenx-0.5.0-2.fc5.src.rpm
fc5-050nxloadconfig.diff:
Index: fc5-050nxloadconfig.diff
===================================================================
RCS file: /cvs/extras/rpms/freenx/FC-5/fc5-050nxloadconfig.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fc5-050nxloadconfig.diff 8 Jul 2006 05:00:18 -0000 1.2
+++ fc5-050nxloadconfig.diff 12 Jul 2006 05:10:47 -0000 1.3
@@ -1,12 +1,63 @@
-diff -Naur nxloadconfig.orig nxloadconfig
+diff -Naur freenx-0.5.0.orig/nxloadconfig freenx-0.5.0/nxloadconfig
--- nxloadconfig.orig 2006-07-07 20:31:35.000000000 -0700
-+++ nxloadconfig 2006-07-07 21:17:06.000000000 -0700
-@@ -158,7 +158,7 @@
++++ nxloadconfig 2006-07-11 20:25:36.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_KDE=startkde
-COMMAND_START_GNOME=gnome-session
-+COMMAND_START_GNOME="/usr/bin/dbus-launch /usr/bin/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"
+diff -Naur freenx-0.5.0.orig/nxsetup freenx-0.5.0/nxsetup
+--- nxsetup.orig 2006-07-07 20:31:35.000000000 -0700
++++ nxsetup 2006-07-11 20:44:09.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
+@@ -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/FC-5/freenx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- freenx.spec 8 Jul 2006 05:00:18 -0000 1.8
+++ freenx.spec 12 Jul 2006 05:10:47 -0000 1.9
@@ -1,6 +1,6 @@
Name: freenx
Version: 0.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Freenx application/thin-client server
Group: Applications/Internet
License: GPL
@@ -10,7 +10,7 @@
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: nx >= 1.5.0
+Requires: nx >= 2.0.0
%description
Freenx is an application/thin-client server based on nx technology.
@@ -66,7 +66,6 @@
then
%{_sbindir}/useradd -r -d $NX_HOME_DIR -s %{_bindir}/nxserver nx
mkdir -p $NX_HOME_DIR/.ssh
- chmod -R 700 $NX_HOME_DIR
fi
if [ ! -e $NX_ETC_DIR/client.id_dsa.key ] || [ ! -e $NX_ETC_DIR/server.id_dsa.pub.key ]
then
@@ -100,6 +99,7 @@
fi
chown -R nx:root $NX_ETC_DIR
chown -R nx:root $NX_HOME_DIR
+chmod -R 700 $NX_HOME_DIR
chown nx:root $NX_LOGFILE
%preun
@@ -127,6 +127,11 @@
%dir %{_var}/lib/nxserver/db/failed
%changelog
+* 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
+- added --override switch to nxsetup to warn users that the setup was already completed
+- retweaked BZ# 197812 fix
* Sun Jul 07 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-1
- updated to 0.5.0 final
- fixed bug with nx user home directory permissions. BZ# 197812
More information about the fedora-extras-commits
mailing list