rpms/freenx/FC-5 .cvsignore, 1.3, 1.4 fc5-050nxloadconfig.diff, 1.1, 1.2 freenx.spec, 1.7, 1.8 sources, 1.3, 1.4

[Richard A. Stout (zipsonic)]

Author: zipsonic

Update of /cvs/extras/rpms/freenx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31931/FC-5

Modified Files:
	.cvsignore fc5-050nxloadconfig.diff freenx.spec sources 
Log Message:
auto-import freenx-0.5.0-1.fc5 on branch FC-5 from freenx-0.5.0-1.fc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freenx/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jun 2006 05:37:19 -0000	1.3
+++ .cvsignore	8 Jul 2006 05:00:18 -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/FC-5/fc5-050nxloadconfig.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fc5-050nxloadconfig.diff	7 Jun 2006 05:37:19 -0000	1.1
+++ fc5-050nxloadconfig.diff	8 Jul 2006 05:00:18 -0000	1.2
@@ -1,30 +1,12 @@
 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 @@
+--- nxloadconfig.orig	2006-07-07 20:31:35.000000000 -0700
++++ nxloadconfig	2006-07-07 21:17:06.000000000 -0700
+@@ -158,7 +158,7 @@
  USER_X_STARTUP_SCRIPT=.Xclients
  DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
  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_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\""
- 
--	[ -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]$") ] && \
+ COMMAND_XAUTH=/usr/X11R6/bin/xauth


Index: freenx.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx/FC-5/freenx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freenx.spec	12 Jun 2006 08:42:46 -0000	1.7
+++ freenx.spec	8 Jul 2006 05:00:18 -0000	1.8
@@ -1,11 +1,11 @@
 Name:           freenx
 Version:        0.5.0
-Release:        0.5.test7%{?dist}
+Release:        1%{?dist}
 Summary:        Freenx application/thin-client server
 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
 ExcludeArch: 	x86_64
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -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,7 @@
 then
         %{_sbindir}/useradd -r -d $NX_HOME_DIR -s %{_bindir}/nxserver nx
         mkdir -p $NX_HOME_DIR/.ssh
-        chmod 700 $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
@@ -127,6 +127,9 @@
 %dir %{_var}/lib/nxserver/db/failed
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freenx/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jun 2006 05:37:19 -0000	1.3
+++ sources	8 Jul 2006 05:00:18 -0000	1.4
@@ -1 +1 @@
-b627433904cd6eed38b14524d3b45cbd  freenx-0.5.0-test-2006-03-11-7.tar.gz
+5ec7a75d9e03f3e175f5a9e855c5537a  freenx-0.5.0.tar.gz