Hello community, here is the log from the commit of package FreeNX checked in at Tue Aug 29 16:21:48 CEST 2006. -------- --- FreeNX/FreeNX.changes 2006-08-25 11:02:40.000000000 +0200 +++ FreeNX/FreeNX.changes 2006-08-29 10:31:18.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 29 10:26:28 CEST 2006 - sndirsch@suse.de + +- freenx-0.5.0.diff: + * moved X11R6 related stuff to xorg7.diff and apply this patch + only for X.Org >= 7 + +------------------------------------------------------------------- New: ---- xorg7.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeNX.spec ++++++ --- /var/tmp/diff_new_pack.cdGP1g/_old 2006-08-29 16:20:53.000000000 +0200 +++ /var/tmp/diff_new_pack.cdGP1g/_new 2006-08-29 16:20:53.000000000 +0200 @@ -11,11 +11,12 @@ # norootforbuild Name: FreeNX +BuildRequires: xorg-x11-devel License: GPL URL: http://debian.tu-bs.de/knoppix/nx/ Group: System/X11/Servers/XF86_4 Version: 0.5.0 -Release: 1 +Release: 2 Requires: NX openssh expect netcat Summary: FreeNX Application and Thin Client Server Source: freenx-%{version}.tar.bz2 @@ -28,6 +29,7 @@ Source7: ANNOUNCE-0.5.0 Source8: NX-Firewall.txt Patch: freenx-%{version}.diff +Patch1: xorg7.diff Patch3: freenx-ld_library_path.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,6 +50,9 @@ %prep %setup -n freenx-%{version} %patch +%if "%(xft-config --prefix)" == "/usr" +%patch1 +%endif %patch3 -p0 %build @@ -74,6 +79,10 @@ /usr/bin/nxprint %changelog -n FreeNX +* Tue Aug 29 2006 - sndirsch@suse.de +- freenx-0.5.0.diff: + * moved X11R6 related stuff to xorg7.diff and apply this patch + only for X.Org >= 7 * Fri Aug 25 2006 - dmueller@suse.de - update to 0.5.0: * NX 2.0 support ++++++ freenx-0.5.0.diff ++++++ --- /var/tmp/diff_new_pack.cdGP1g/_old 2006-08-29 16:20:53.000000000 +0200 +++ /var/tmp/diff_new_pack.cdGP1g/_new 2006-08-29 16:20:53.000000000 +0200 @@ -1,25 +1,3 @@ ---- node.conf.sample -+++ node.conf.sample -@@ -317,7 +317,7 @@ - - # The key that contains the name of the complete path of command name - # 'xauth'. --#COMMAND_XAUTH=/usr/X11R6/bin/xauth -+#COMMAND_XAUTH=/usr/bin/xauth - - # The key that contains the name of the complete path of command name - # 'smbmount'. ---- nxclient -+++ nxclient -@@ -60,7 +60,7 @@ - else - dialog_interface="xmessage" - xmessage=$(which xmessage 2>/dev/null) -- [ -z "$xmessage" ] && xmessage="/usr/X11R6/bin/xmessage" -+ [ -z "$xmessage" ] && xmessage="/usr/bin/xmessage" - fi - - # --- nxloadconfig +++ nxloadconfig @@ -56,8 +56,8 @@ @@ -33,15 +11,6 @@ PATH_LIB=$NX_DIR/lib NX_ETC_DIR=/etc/nxserver NX_SESS_DIR=/var/lib/nxserver/db -@@ -161,7 +161,7 @@ - COMMAND_START_GNOME=gnome-session - COMMAND_START_CDE=cdwm - COMMAND_XTERM=xterm --COMMAND_XAUTH=/usr/X11R6/bin/xauth -+COMMAND_XAUTH=/usr/bin/xauth - COMMAND_SMBMOUNT=smbmount - COMMAND_SMBUMOUNT=smbumount - COMMAND_NETCAT=netcat @@ -489,7 +489,7 @@ ERROR="yes" && echo "Error: Invalid value \"COMMAND_MD5SUM=$COMMAND_MD5SUM\"" ++++++ xorg7.diff ++++++ --- node.conf.sample +++ node.conf.sample @@ -317,7 +317,7 @@ # The key that contains the name of the complete path of command name # 'xauth'. -#COMMAND_XAUTH=/usr/X11R6/bin/xauth +#COMMAND_XAUTH=/usr/bin/xauth # The key that contains the name of the complete path of command name # 'smbmount'. --- nxclient +++ nxclient @@ -60,7 +60,7 @@ else dialog_interface="xmessage" xmessage=$(which xmessage 2>/dev/null) - [ -z "$xmessage" ] && xmessage="/usr/X11R6/bin/xmessage" + [ -z "$xmessage" ] && xmessage="/usr/bin/xmessage" fi # --- nxloadconfig +++ nxloadconfig @@ -161,7 +161,7 @@ COMMAND_START_GNOME=gnome-session COMMAND_START_CDE=cdwm COMMAND_XTERM=xterm -COMMAND_XAUTH=/usr/X11R6/bin/xauth +COMMAND_XAUTH=/usr/bin/xauth COMMAND_SMBMOUNT=smbmount COMMAND_SMBUMOUNT=smbumount COMMAND_NETCAT=netcat ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠suse.de