- up to 0.7.1

Changed files:
    freenx-node-conf.patch -> 1.4
    freenx-server.spec -> 1.28

diff --git a/freenx-node-conf.patch b/freenx-node-conf.patch
index 32c8d621355bd57455d4d02c7230c970b38149a1..b0fb19dd7cfe9cdea9423f7855bd9b9c19645a1d 100644 (file)
--- a/freenx-node-conf.patch
+++ b/freenx-node-conf.patch
@@ -1,7 +1,6 @@
-diff -ur freenx-0.5.0-test-2006-03-08-5-o/node.conf.sample freenx-0.5.0-test-2006-03-08-5/node.conf.sample
---- freenx-0.5.0-test-2006-03-08-5-o/node.conf.sample  2005-08-29 05:44:59.000000000 -0600
-+++ freenx-0.5.0-test-2006-03-08-5/node.conf.sample    2006-05-23 01:21:41.000000000 -0600
-@@ -305,7 +305,13 @@
+--- freenx-0.7.1/node.conf.sample.orig 2007-10-15 00:25:14.000000000 +0200
++++ freenx-0.7.1/node.conf.sample      2008-05-20 19:03:12.000000000 +0200
+@@ -394,7 +394,13 @@
  
  # The key that contains the name of the complete path of command name
  # 'xauth'.
@@ -16,8 +15,8 @@ diff -ur freenx-0.5.0-test-2006-03-08-5-o/node.conf.sample freenx-0.5.0-test-200
  
  # The key that contains the name of the complete path of command name
  # 'smbmount'.
-@@ -316,7 +322,7 @@
- #COMMAND_SMBUMOUNT=smbumount
+@@ -413,7 +419,7 @@
+ #COMMAND_SMBUMOUNT_CIFS=/sbin/umount.cifs
  
  # The key that contains the name of the complete path of the 'netcat' command.
 -#COMMAND_NETCAT=netcat
@@ -25,7 +24,7 @@ diff -ur freenx-0.5.0-test-2006-03-08-5-o/node.conf.sample freenx-0.5.0-test-200
  
  # The key that contains the name of the complete path of the 'ssh' and
  # 'ssh-keygen' command.
-@@ -363,7 +369,7 @@
+@@ -476,7 +482,7 @@
  # for examples of useful parameters.
  #AGENT_EXTRA_OPTIONS_RFB=""
  #AGENT_EXTRA_OPTIONS_RDP=""
@@ -34,9 +33,12 @@ diff -ur freenx-0.5.0-test-2006-03-08-5-o/node.conf.sample freenx-0.5.0-test-200
  
  # The number of seconds we wait for the nxagent to start before
  # deciding startup has failed
-@@ -384,3 +390,5 @@
- 
+@@ -498,6 +504,8 @@
  # Extra options to nxproxy. See !M documentation for useful parameters.
  #PROXY_EXTRA_OPTIONS=""
-+
+ 
 +APPLICATION_LIBRARY_PRELOAD="/usr/lib/libX11-nx.so.6:/usr/lib/libXext-nx.so.6:/usr/lib/libXcomp.so.2:/usr/lib/libXcompext.so.2:/usr/lib/libXrender-nx.so.1"
++
+ # In case you want to use an external 'rdesktop' command
+ # set this to "1".
+ # 

diff --git a/freenx-server.spec b/freenx-server.spec
index ac0a376c19f8f85831e9b7d68a2f1e53a12e96ab..341f748997db61fef20eec010e5030cfbe7eb809 100644 (file)
--- a/freenx-server.spec
+++ b/freenx-server.spec
@@ -1,13 +1,15 @@
+# TODO
+# - nxserver-helper ?
 Summary:       A free (GPL) implementation of the NX server
 Summary(pl.UTF-8):     Darmowa (GPL) imlementacja serwera NX
 Name:          freenx
-Version:       0.6.0
+Version:       0.7.1
 Release:       1
 License:       GPL v2
 Group:         X11/Applications/Networking
 Source0:       http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
-# Source0-md5: 504aaa2c3c93c36eefab74e2b8a6506e
-Patch0:        freenx-node-conf.patch
+# Source0-md5: 80e7a57f787daabd0f80dfe8f58e67d3
+Patch0:                freenx-node-conf.patch
 URL:           http://freenx.berlios.de/
 BuildRequires: sed >= 4.0
 Requires:      expect
@@ -55,7 +57,8 @@ install -d $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/nxserver
 install node.conf.sample $RPM_BUILD_ROOT%{_sysconfdir}/nxserver/node.conf
 
-install nxkeygen nxserver nxloadconfig nxnode nxsetup nxnode-login nxclient nxprint $RPM_BUILD_ROOT%{_bindir}
+install nxcheckload.sample $RPM_BUILD_ROOT%{_bindir}/nxcheckload
+install nxcups-gethost nxdesktop_helper nxdialog nxkeygen nxloadconfig nxnode nxnode-login nxprint nxserver nxsetup $RPM_BUILD_ROOT%{_bindir}
 
 
 %clean