rpms/freenx/devel .cvsignore, 1.3, 1.4 fc5-050nxloadconfig.diff, 1.1, 1.2 freenx.spec, 1.2, 1.3 sources, 1.3, 1.4
Richard A. Stout (zipsonic)
fedora-extras-commits at redhat.com
Wed Jul 12 05:11:59 UTC 2006
Author: zipsonic
Update of /cvs/extras/rpms/freenx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12665/devel
Modified Files:
.cvsignore fc5-050nxloadconfig.diff freenx.spec sources
Log Message:
auto-import freenx-0.5.0-2.fc5 on branch devel from freenx-0.5.0-2.fc5.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freenx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Jun 2006 07:36:15 -0000 1.3
+++ .cvsignore 12 Jul 2006 05:11:58 -0000 1.4
@@ -1 +1 @@
-freenx-0.5.0-test-2006-03-11-7.tar.gz
+freenx-0.5.0.tar.gz
fc5-050nxloadconfig.diff:
Index: fc5-050nxloadconfig.diff
===================================================================
RCS file: /cvs/extras/rpms/freenx/devel/fc5-050nxloadconfig.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fc5-050nxloadconfig.diff 8 Jun 2006 07:36:15 -0000 1.1
+++ fc5-050nxloadconfig.diff 12 Jul 2006 05:11:58 -0000 1.2
@@ -1,30 +1,63 @@
-diff -Naur nxloadconfig.orig nxloadconfig
---- nxloadconfig.orig 2006-04-13 09:20:46.000000000 -0700
-+++ nxloadconfig 2006-04-13 09:32:07.000000000 -0700
-@@ -153,14 +153,15 @@
+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-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=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=$(which xauth)
- [ -z "$COMMAND_XAUTH" ] && COMMAND_XAUTH=/usr/X11R6/bin/xauth
- COMMAND_SMBMOUNT=smbmount
- COMMAND_SMBUMOUNT=smbumount
--COMMAND_NETCAT=netcat
-+COMMAND_NETCAT=nc
- COMMAND_SSH=ssh
- COMMAND_SSH_KEYGEN=ssh-keygen
- COMMAND_CUPSD=/usr/sbin/cupsd
-@@ -496,7 +497,7 @@
- [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
- ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
+ COMMAND_XAUTH=/usr/X11R6/bin/xauth
+@@ -173,7 +173,7 @@
-- [ -z "$(strings $PATH_BIN/nxagent | grep 'NXAGENT - Version 1.5.0')"] && \
-+ [ -z "$(strings $PATH_BIN/nxagent | grep 'NXAGENT - Version 1.5.0')" ] && \
- ERROR="yes" && echo "Error: Could not find 1.5.0 version string in nxagent. NX 1.5.0 backend is needed for this version of FreeNX."
-
- [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
+ # 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/devel/freenx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freenx.spec 8 Jun 2006 07:36:15 -0000 1.2
+++ freenx.spec 12 Jul 2006 05:11:58 -0000 1.3
@@ -1,16 +1,16 @@
Name: freenx
Version: 0.5.0
-Release: 0.3.test7%{?dist}
+Release: 2%{?dist}
Summary: Freenx application/thin-client server
-Group: Applications/Internet
+Group: Applications/Internet
License: GPL
URL: http://freenx.berlios.de
-Source0: %{name}-%{version}-test-2006-03-11-7.tar.gz
+Source0: %{name}-%{version}.tar.gz
Patch0: fc5-050nxloadconfig.diff
-BuildArch: noarch
+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.
@@ -20,7 +20,7 @@
of the nxserver component.
%prep
-%setup -q -n %{name}-%{version}-test-2006-03-11-7
+%setup -q -n %{name}-%{version}
%patch0 -p0
@@ -66,7 +66,6 @@
then
%{_sbindir}/useradd -r -d $NX_HOME_DIR -s %{_bindir}/nxserver nx
mkdir -p $NX_HOME_DIR/.ssh
- chmod 700 $NX_HOME_DIR/.ssh
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,16 @@
%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
+* Sun Jun 11 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-0.5.test7
+- Removed buildarch: noarch, and added excludearch: x86_64 to fix broken dependencies in x86_64
* Wed Jun 07 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-0.3.test7
- added dist tag
* Wed Jun 07 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-0.2.test7
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freenx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Jun 2006 07:36:15 -0000 1.3
+++ sources 12 Jul 2006 05:11:58 -0000 1.4
@@ -1 +1 @@
-b627433904cd6eed38b14524d3b45cbd freenx-0.5.0-test-2006-03-11-7.tar.gz
+5ec7a75d9e03f3e175f5a9e855c5537a freenx-0.5.0.tar.gz
More information about the fedora-extras-commits
mailing list