Mailinglist Archive: opensuse-commit (1301 mails)
| < Previous | Next > |
commit FreeNX
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 05 Jul 2007 19:49:20 +0200
- Message-id: <20070705174921.24DE067817A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package FreeNX
checked in at Thu Jul 5 19:49:20 CEST 2007.
--------
--- FreeNX/FreeNX.changes 2007-06-29 05:33:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/FreeNX/FreeNX.changes 2007-07-05 19:16:39.707436000 +0200
@@ -1,0 +2,21 @@
+Thu Jul 5 18:41:16 CEST 2007 - sndirsch@xxxxxxx
+
+- nxagent binary now in /usr/lib/NX
+- NX libs are now in /usr/lib/NX/lib
+- wrapper scripts in /usr/bin for nxproxy, nxagent, nxdesktop,
+ nxviewer and nxpasswd now in NX package
+
+-------------------------------------------------------------------
+Thu Jul 5 16:04:17 CEST 2007 - sndirsch@xxxxxxx
+
+- moved scripts/executables back to /usr/bin (makes previously
+ introduced %post obsolete)
+- added wrapper scripts for nxproxy, nxagent, nxdesktop, nxviewer
+ and nxpasswd in /usr/bin
+
+-------------------------------------------------------------------
+Thu Jul 5 12:34:02 CEST 2007 - sndirsch@xxxxxxx
+
+- %post: adjust nxserver path in /etc/passwd
+
+-------------------------------------------------------------------
New:
----
nxproxy
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ FreeNX.spec ++++++
--- /var/tmp/diff_new_pack.O10050/_old 2007-07-05 19:49:09.000000000 +0200
+++ /var/tmp/diff_new_pack.O10050/_new 2007-07-05 19:49:09.000000000 +0200
@@ -20,7 +20,7 @@
URL: http://freenx.berlios.de/
Group: System/X11/Servers/XF86_4
Version: 0.6.0
-Release: 24
+Release: 25
Requires: NX openssh expect netcat
Summary: FreeNX Application and Thin Client Server
Source: freenx-%{version}.tar.gz
@@ -33,6 +33,7 @@
Source7: ANNOUNCE-0.5.0
Source8: NX-Firewall.txt
Source9: ANNOUNCE-0.6.0
+Source10: nxproxy
Patch: freenx-%{version}.diff
Patch1: xorg7.diff
Patch2: xcb-unix.diff
@@ -65,13 +66,18 @@
%build
%install
-mkdir -p $RPM_BUILD_ROOT/usr/NX/bin
+mkdir -p $RPM_BUILD_ROOT/usr/bin
make -C nxserver-helper
mv nxserver-helper tmp
mv tmp/nxserver-helper .
rm -rf tmp
mv nxcheckload.sample nxcheckload
-install -m 755 nx* $RPM_BUILD_ROOT/usr/NX/bin
+install -m 755 nx* $RPM_BUILD_ROOT/usr/bin
+install -m 755 $RPM_SOURCE_DIR/nxproxy $RPM_BUILD_ROOT/%_bindir/
+#ln -snf nxproxy $RPM_BUILD_ROOT/%_bindir/nxagent
+#ln -snf nxproxy $RPM_BUILD_ROOT/%_bindir/nxdesktop
+#ln -snf nxproxy $RPM_BUILD_ROOT/%_bindir/nxviewer
+#ln -snf nxproxy $RPM_BUILD_ROOT/%_bindir/nxpasswd
mkdir -p $RPM_BUILD_ROOT/etc/nxserver
install -m 644 node.conf.sample $RPM_BUILD_ROOT/etc/nxserver/node.conf
cp $RPM_SOURCE_DIR/{README.SuSE,ANNOUNCE-*,NX-Firewall.txt} .
@@ -81,11 +87,21 @@
%doc README.SuSE AUTHORS CONTRIB COPYING ChangeLog INSTALL ANNOUNCE-* NX-Firewall.txt
%dir /etc/nxserver
%config /etc/nxserver/node.conf
-%dir /usr/NX
-%dir /usr/NX/bin
-/usr/NX/bin/*
+/usr/bin/*
%changelog
+* Thu Jul 05 2007 - sndirsch@xxxxxxx
+- nxagent binary now in /usr/lib/NX
+- NX libs are now in /usr/lib/NX/lib
+- wrapper scripts in /usr/bin for nxproxy, nxagent, nxdesktop,
+ nxviewer and nxpasswd now in NX package
+* Thu Jul 05 2007 - sndirsch@xxxxxxx
+- moved scripts/executables back to /usr/bin (makes previously
+ introduced %%post obsolete)
+- added wrapper scripts for nxproxy, nxagent, nxdesktop, nxviewer
+ and nxpasswd in /usr/bin
+* Thu Jul 05 2007 - sndirsch@xxxxxxx
+- %%post: adjust nxserver path in /etc/passwd
* Fri Jun 29 2007 - sndirsch@xxxxxxx
- xcb-unix.diff:
* looks like libxcb does no longer accept the unix: notation and
++++++ freenx-0.6.0.diff ++++++
--- /var/tmp/diff_new_pack.O10050/_old 2007-07-05 19:49:09.000000000 +0200
+++ /var/tmp/diff_new_pack.O10050/_new 2007-07-05 19:49:09.000000000 +0200
@@ -1,16 +1,3 @@
---- nxloadconfig
-+++ nxloadconfig
-@@ -56,8 +56,8 @@
- NX_LICENSE="OS (GPL)"
-
- # Where can different nx components be found
--NX_DIR=/usr
--PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
-+NX_DIR=/usr/NX
-+PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
- PATH_LIB=$NX_DIR/lib
- NX_ETC_DIR=/etc/nxserver
- NX_SESS_DIR=/var/lib/nxserver/db
--- nxloadconfig.orig 2007-05-02 14:58:25.000000000 +0200
+++ nxloadconfig 2007-05-02 14:59:40.000000000 +0200
@@ -263,7 +263,7 @@
@@ -22,3 +9,25 @@
if [ -z "$ENABLE_2_0_0_BACKEND" ]
then
ENABLE_2_0_0_BACKEND="1"
+--- nxloadconfig.orig 2007-07-05 16:37:31.000000000 +0200
++++ nxloadconfig 2007-07-05 16:37:57.000000000 +0200
+@@ -267,7 +267,7 @@
+ if [ -z "$ENABLE_2_0_0_BACKEND" ]
+ then
+ ENABLE_2_0_0_BACKEND="1"
+- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
++ [ -z "$(strings /usr/lib/NX/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
+ fi
+
+ [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
+--- nxloadconfig.orig 2007-07-05 19:11:07.000000000 +0200
++++ nxloadconfig 2007-07-05 19:11:29.000000000 +0200
+@@ -58,7 +58,7 @@
+ # Where can different nx components be found
+ NX_DIR=/usr
+ PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
+-PATH_LIB=$NX_DIR/lib
++PATH_LIB=$NX_DIR/lib/NX/lib
+ NX_ETC_DIR=/etc/nxserver
+ NX_SESS_DIR=/var/lib/nxserver/db
+ NX_HOME_DIR=/var/lib/nxserver/home
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |