rpms/freenx/devel nxclient.diff,NONE,1.1 freenx.spec,1.4,1.5

[Richard A. Stout (zipsonic)]

Author: zipsonic

Update of /cvs/extras/rpms/freenx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19925/devel

Modified Files:
	freenx.spec 
Added Files:
	nxclient.diff 
Log Message:
auto-import freenx-0.5.0-5.fc6 on branch devel from freenx-0.5.0-5.fc6.src.rpm

nxclient.diff:

--- NEW FILE nxclient.diff ---
--- nxclient.orig	2006-09-03 13:13:31.000000000 -0700
+++ nxclient		2006-08-21 13:44:23.000000000 -0700
@@ -9,7 +9,7 @@
 #       but we set it to a "good value" anyway in case 
 #       it does check it someday.
 #
-# CVS: $Id: nxclient,v 1.5 2005/04/25 02:11:24 fabianx Exp $
+# SVN: $Id: nxclient 229 2006-07-04 23:53:17Z fabianx $
 #
 # ========================================================================
 
@@ -19,7 +19,7 @@
 [ -x "$NXCLIENT" -a "$(file -bi $NXCLIENT)" != 'application/x-shellscript' ] \
 	&& exec ${NXCLIENT} "$@"
 
-TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer: -n $(basename $0) -- "$@"`
+TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer:,parent: -n $(basename $0) -- "$@"`
 
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 
@@ -32,6 +32,7 @@
 DIALOG_LOCAL=""
 DIALOG_NOAUTOKILL=""
 DIALOG_PRINTER=""
+DIALOG_PARENT="$PPID"
 
 while true
 do
@@ -43,6 +44,7 @@
 		--noautokill) DIALOG_NOAUTOKILL="yes"; shift ;;
 		--display) DISPLAY="$2"; shift 2 ;;
 		--printer) DIALOG_PRINTER="$2"; shift 2 ; break ;;
+		--parent) DIALOG_PARENT="$2"; shift 2 ;;
 		--) shift ; break ;;
                 *) echo "Internal error!" ; exit 1; ;;
 	esac
@@ -329,6 +331,6 @@
 #
 
 RC=$?
-	[ $RC -eq 2 ] && kill -TERM $PPID
-	[ $RC -eq 3 ] && kill -HUP $PPID
+	[ $RC -eq 2 ] && kill -TERM $DIALOG_PARENT
+	[ $RC -eq 3 ] && kill -HUP $DIALOG_PARENT
 exit 0


Index: freenx.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx/devel/freenx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freenx.spec	3 Sep 2006 20:05:34 -0000	1.4
+++ freenx.spec	29 Sep 2006 05:31:28 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           freenx
 Version:        0.5.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Freenx application/thin-client server
 Group:          Applications/Internet 
 License:        GPL
 URL:            http://freenx.berlios.de
 Source0:        %{name}-%{version}.tar.gz
 Patch0:		fc5patch.diff
+Patch1:		nxclient.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 dbus-x11
@@ -23,6 +24,7 @@
 %setup -q -n %{name}-%{version}
 
 %patch0 -p1
+%patch1 -p0
 
 %build
 
@@ -127,6 +129,9 @@
 %dir %{_var}/lib/nxserver/db/failed
 
 %changelog
+* Thu Sep 28 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-5
+- updated nxclient script to svn which fixes problems with suspend when
+  !M client is not installed on the server.
 * 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