Author: glen Date: Tue Nov 22 15:37:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - precreate nx user - all %build is broken
---- Files affected: SPECS: freenx.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/freenx.spec diff -u SPECS/freenx.spec:1.13 SPECS/freenx.spec:1.14 --- SPECS/freenx.spec:1.13 Tue Nov 22 16:25:24 2005 +++ SPECS/freenx.spec Tue Nov 22 16:37:45 2005 @@ -3,7 +3,7 @@ Summary(pl): Darmowa (GPL) imlementacja serwera NX Name: freenx Version: 0.4.2 -Release: 1 +Release: 1.1 License: GPL v2 Group: X11/Applications/Networking Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz @@ -14,6 +14,10 @@ Requires: nc Requires: nx-X11 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 @@ -33,11 +37,12 @@ %prep %setup -q -%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 @@ -49,6 +54,10 @@ %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 @@ -70,6 +79,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.14 2005/11/22 15:37:45 glen +- precreate nx user +- all %build is broken + Revision 1.13 2005/11/22 15:25:24 glen - %post is broken. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/freenx.spec?r1=1.13&r2=1.14&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
