X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=freenx-server.spec;h=9ba6ceb2f82b12b478d446f62ad3921c1ef70de8;hb=dee3bbee627a3f7a352358dd0608c1eb5115998d;hp=962489db58b9a837ac9654d97edce0f07d952e74;hpb=0e9d8367c931d8e7f7d985f32b72e56e5a72f625;p=packages%2Ffreenx-server.git

diff --git a/freenx-server.spec b/freenx-server.spec
index 962489d..9ba6ceb 100644
--- a/freenx-server.spec
+++ b/freenx-server.spec
@@ -1,18 +1,25 @@
 Summary:	A free (GPL) implementation of the NX server
 Summary(pl):	Darmowa (GPL) imlementacja serwera NX
 Name:		freenx
-Version:	0.4.2
-Release:	1
+Version:	0.5.0
+%define cvs 2006-03-08-5
+Release:	0.%(echo %{cvs} | tr '-' '.').1
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
-# Source0-md5:	4b74709736ab1784403a61ba06cbde50
-URL:		http://freenx.berlios.de/
+Source0:	http://debian.tu-bs.de/knoppix/nx/snapshots/freenx-%{version}-test-%{cvs}.tar.gz
+# Source0-md5:	db02370347fc31dd190db047f4481022
+URL:		http://debian.tu-bs.de/knoppix/nx/
 BuildRequires:	sed >= 4.0
 Requires:	expect
 Requires:	nc
 Requires:	nx-X11
+Requires:	xorg-app-xmessage
+Requires:	xinitrc-ng
 Requires:	openssh-server
+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
@@ -30,13 +37,14 @@ zdalnych sesjach X11 nawet przy pr
 Ten pakiet zawiera darmow± (GPL) implementacjê komponentu nxserwer.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-test-%{cvs}
 
-%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
@@ -48,6 +56,10 @@ 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
 # FIXME: this displays usage. what it should do?
 #%{_bindir}/nxsetup