X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=freenx-server.spec;h=4dc3ae122078ecb5f218a0ef669ab6b39066dc0f;hb=f36ed1d7e5d539a777f16fb43731ed4e8aa505cd;hp=fab4fe3236e13891d1b6ada06a6ce5c4d732f4fa;hpb=d67b08ec2bb2d2c8724eb2ed29e1c2b3680bd6f7;p=packages%2Ffreenx-server.git

diff --git a/freenx-server.spec b/freenx-server.spec
index fab4fe3..4dc3ae1 100644
--- a/freenx-server.spec
+++ b/freenx-server.spec
@@ -1,18 +1,27 @@
 Summary:	A free (GPL) implementation of the NX server
 Summary(pl):	Darmowa (GPL) imlementacja serwera NX
 Name:		freenx
-Version:	0.4.0
+Version:	0.6.0
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
-# Source0-md5:	a57046e79fb980b4720ec6ae67ed1f19
+# Source0-md5:	504aaa2c3c93c36eefab74e2b8a6506e
+Patch0:	freenx-node-conf.patch
 URL:		http://freenx.berlios.de/
 BuildRequires:	sed >= 4.0
 Requires:	expect
 Requires:	nc
 Requires:	nx-X11
+Requires:	xorg-app-xmessage
+Requires:	xorg-app-xauth
+Requires:	xinitrc-ng
 Requires:	openssh-server
+Requires:	openssh-clients
+Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/useradd
+Requires(postun):	/usr/sbin/userdel
+Provides:	user(nx)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,25 +40,34 @@ Ten pakiet zawiera darmow
 
 %prep
 %setup -q
+%patch0 -p1
 
-%build
-sed -i -e 's#useradd -d $NX_HOME_DIR -s $(which nxserver) nx#useradd -d $NX_HOME_DIR -u 138 -s $(which nxserver) nx#g' nxsetup
-sed -i -e 's#NX_HOME_DIR=/home/.nx/#NX_HOME_DIR=%{_sysconfdir}/nxserver/#g' nxserver
-sed -i -e 's#netcat#nc#g' nxserver
-sed -i -e 's#export PATH#export LD_LIBRARY_PATH=%{_libdir}/NX/lib\nexport PATH#g' nxnode
+#%build
+# THIS ALL IS BROKEN. create .patch next time.
+#sed -i -e 's#useradd -d $NX_HOME_DIR -s $(which nxserver) nx#useradd -d $NX_HOME_DIR -u 138 -s $(which nxserver) nx#g' nxsetup
+#sed -i -e 's#NX_HOME_DIR=/home/.nx/#NX_HOME_DIR=%{_sysconfdir}/nxserver/#g' nxserver
+#sed -i -e 's#netcat#nc#g' nxserver
+#sed -i -e 's#export PATH#export LD_LIBRARY_PATH=%{_libdir}/NX/lib\nexport PATH#g' nxnode
 
 %install
 rm -rf $RPM_BUILD_ROOT
 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 nx* $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# FIXME: what group it should have?
+%useradd -u 160 -d %{_sysconfdir}/nxserver -s %{_bindir}/nxserver -g users -c "FreeNX User" nx
+
 %post
-%{_bindir}/nxsetup
+# FIXME: this displays usage. what it should do?
+#%{_bindir}/nxsetup
 
 %postun
 if [ "$1" = "0" ]; then
@@ -60,4 +78,5 @@ fi
 %defattr(644,root,root,755)
 %doc AUTHORS CONTRIB ChangeLog
 %attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/nxserver
+%dir %{_sysconfdir}/nxserver
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nxserver/node.conf