rpms/freenx/FC-5 freenx.spec,1.2,1.3
Richard A. Stout (zipsonic)
fedora-extras-commits at redhat.com
Thu Jun 8 05:12:50 UTC 2006
Author: zipsonic
Update of /cvs/extras/rpms/freenx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32511
Modified Files:
freenx.spec
Log Message:
Updated Spec for macro/variable inconsistencies
Index: freenx.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx/FC-5/freenx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freenx.spec 7 Jun 2006 05:37:19 -0000 1.2
+++ freenx.spec 8 Jun 2006 05:12:50 -0000 1.3
@@ -1,13 +1,11 @@
Name: freenx
Version: 0.5.0
-Release: 0.1.test7
-Summary: freenx application/thin-client server
-
+Release: 0.2.test7
+Summary: Freenx application/thin-client server
Group: Applications/Internet
License: GPL
URL: http://freenx.berlios.de
-#Source0: freenx-%{version}.tar.gz
-Source0: freenx-0.5.0-test-2006-03-11-7.tar.gz
+Source0: %{name}-%{version}-test-2006-03-11-7.tar.gz
Patch0: fc5-050nxloadconfig.diff
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,29 +20,28 @@
of the nxserver component.
%prep
-#%setup -q -n freenx-%{version}
-%setup -q -n freenx-0.5.0-test-2006-03-11-7
+%setup -q -n %{name}-%{version}-test-2006-03-11-7
%patch0 -p0
%build
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/nxserver
-mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/nxserver/db/closed
-mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/nxserver/db/running
-mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/nxserver/db/failed
-chmod 700 $RPM_BUILD_ROOT/%{_var}/lib/nxserver
-chmod 700 $RPM_BUILD_ROOT/%{_var}/lib/nxserver/*
-chmod 700 $RPM_BUILD_ROOT/%{_var}/lib/nxserver/db/*
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{_sysconfdir}/nxserver
+mkdir -p %{buildroot}/%{_var}/lib/nxserver/db/closed
+mkdir -p %{buildroot}/%{_var}/lib/nxserver/db/running
+mkdir -p %{buildroot}/%{_var}/lib/nxserver/db/failed
+chmod 700 %{buildroot}/%{_var}/lib/nxserver
+chmod 700 %{buildroot}/%{_var}/lib/nxserver/*
+chmod 700 %{buildroot}/%{_var}/lib/nxserver/db/*
install -m 755 nxclient nxnode nxkeygen nxnode-login nxserver nxprint nxsetup\
- nxloadconfig $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 node.conf.sample $RPM_BUILD_ROOT/%{_sysconfdir}/nxserver
+ nxloadconfig %{buildroot}/%{_bindir}
+install -m 755 node.conf.sample %{buildroot}/%{_sysconfdir}/nxserver
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
export $(grep ^NX_DIR %{_bindir}/nxloadconfig)
@@ -54,56 +51,56 @@
export $(grep ^NX_LOGFILE %{_bindir}/nxloadconfig)
export $(grep ^SSH_AUTHORIZED_KEYS %{_bindir}/nxloadconfig)
/sbin/service sshd condrestart
-touch ${NX_ETC_DIR}/passwords ${NX_ETC_DIR}/passwords.orig ${NX_LOGFILE}
-chmod 600 ${NX_ETC_DIR}/pass* ${NX_LOGFILE}
-if [ ! -e ${NX_ETC_DIR}/users.id_dsa ]
+touch $NX_ETC_DIR/passwords $NX_ETC_DIR/passwords.orig $NX_LOGFILE
+chmod 600 $NX_ETC_DIR/pass* $NX_LOGFILE
+if [ ! -e $NX_ETC_DIR/users.id_dsa ]
then
- %{_bindir}/ssh-keygen -f ${NX_ETC_DIR}/users.id_dsa -t dsa -N "" > /dev/null 2>&1
+ %{_bindir}/ssh-keygen -f $NX_ETC_DIR/users.id_dsa -t dsa -N "" > /dev/null 2>&1
fi
-if [ -e ${NX_HOME_DIR}/.ssh/client.id_dsa.key ] && [ -e ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ]
+if [ -e $NX_HOME_DIR/.ssh/client.id_dsa.key ] && [ -e $NX_HOME_DIR/.ssh/server.id_dsa.pub.key ]
then
- mv -f ${NX_HOME_DIR}/.ssh/client.id_dsa.key ${NX_ETC_DIR}/client.id_dsa.key
- mv -f ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ${NX_ETC_DIR}/server.id_dsa.pub.key
+ mv -f $NX_HOME_DIR/.ssh/client.id_dsa.key $NX_ETC_DIR/client.id_dsa.key
+ mv -f $NX_HOME_DIR/.ssh/server.id_dsa.pub.key $NX_ETC_DIR/server.id_dsa.pub.key
fi
if ! { getent passwd | egrep -q "^nx:"; }
then
- %{_sbindir}/useradd -r -d ${NX_HOME_DIR} -s %{_bindir}/nxserver nx
- mkdir -p ${NX_HOME_DIR}/.ssh
- chmod 700 ${NX_HOME_DIR}/.ssh
-fi
-if [ ! -e ${NX_ETC_DIR}/client.id_dsa.key ] || [ ! -e ${NX_ETC_DIR}/server.id_dsa.pub.key ]
-then
- rm -f ${NX_ETC_DIR}/client.id_dsa.key
- rm -f ${NX_ETC_DIR}/server.id_dsa.pub.key
- %{_bindir}/ssh-keygen -q -t dsa -N '' -f ${NX_ETC_DIR}/local.id_dsa
- mv ${NX_ETC_DIR}/local.id_dsa ${NX_ETC_DIR}/client.id_dsa.key
- mv ${NX_ETC_DIR}/local.id_dsa.pub ${NX_ETC_DIR}/server.id_dsa.pub.key
-fi
-cp -f ${NX_ETC_DIR}/client.id_dsa.key ${NX_HOME_DIR}/.ssh/client.id_dsa.key
-cp -f ${NX_ETC_DIR}/server.id_dsa.pub.key ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-chmod 600 ${NX_ETC_DIR}/client.id_dsa.key ${NX_ETC_DIR}/server.id_dsa.pub.key\
- ${NX_HOME_DIR}/.ssh/client.id_dsa.key ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
+ %{_sbindir}/useradd -r -d $NX_HOME_DIR -s %{_bindir}/nxserver nx
+ mkdir -p $NX_HOME_DIR/.ssh
+ chmod 700 $NX_HOME_DIR/.ssh
+fi
+if [ ! -e $NX_ETC_DIR/client.id_dsa.key ] || [ ! -e $NX_ETC_DIR/server.id_dsa.pub.key ]
+then
+ rm -f $NX_ETC_DIR/client.id_dsa.key
+ rm -f $NX_ETC_DIR/server.id_dsa.pub.key
+ %{_bindir}/ssh-keygen -q -t dsa -N '' -f $NX_ETC_DIR/local.id_dsa
+ mv $NX_ETC_DIR/local.id_dsa $NX_ETC_DIR/client.id_dsa.key
+ mv $NX_ETC_DIR/local.id_dsa.pub $NX_ETC_DIR/server.id_dsa.pub.key
+fi
+cp -f $NX_ETC_DIR/client.id_dsa.key $NX_HOME_DIR/.ssh/client.id_dsa.key
+cp -f $NX_ETC_DIR/server.id_dsa.pub.key $NX_HOME_DIR/.ssh/server.id_dsa.pub.key
+chmod 600 $NX_ETC_DIR/client.id_dsa.key $NX_ETC_DIR/server.id_dsa.pub.key\
+ $NX_HOME_DIR/.ssh/client.id_dsa.key $NX_HOME_DIR/.ssh/server.id_dsa.pub.key
echo -n "no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command=\"%{_bindir}/nxserver\" "\
- > ${NX_HOME_DIR}/.ssh/authorized_keys2
-cat ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key >> ${NX_HOME_DIR}/.ssh/authorized_keys2
-chmod 640 ${NX_HOME_DIR}/.ssh/authorized_keys2
-echo -n "127.0.0.1 " > ${NX_HOME_DIR}/.ssh/known_hosts
-cat %{_sysconfdir}/ssh/ssh_host_rsa_key.pub >> ${NX_HOME_DIR}/.ssh/known_hosts
+ > $NX_HOME_DIR/.ssh/authorized_keys2
+cat $NX_HOME_DIR/.ssh/server.id_dsa.pub.key >> $NX_HOME_DIR/.ssh/authorized_keys2
+chmod 640 $NX_HOME_DIR/.ssh/authorized_keys2
+echo -n "127.0.0.1 " > $NX_HOME_DIR/.ssh/known_hosts
+cat %{_sysconfdir}/ssh/ssh_host_rsa_key.pub >> $NX_HOME_DIR/.ssh/known_hosts
chown -R nx:root %{_var}/lib/nxserver
chown -R nx:root $NX_SESS_DIR
if [ -e %{_var}/lib/nxserver/running ]
then
- mv %{_var}/lib/nxserver/running/* ${NX_SESS_DIR}/running
- mv %{_var}/lib/nxserver/closed/* ${NX_SESS_DIR}/closed
- mv %{_var}/lib/nxserver/failed/* ${NX_SESS_DIR}/failed
+ mv %{_var}/lib/nxserver/running/* $NX_SESS_DIR/running
+ mv %{_var}/lib/nxserver/closed/* $NX_SESS_DIR/closed
+ mv %{_var}/lib/nxserver/failed/* $NX_SESS_DIR/failed
rm -rf %{_var}/lib/nxserver/running
rm -rf %{_var}/lib/nxserver/closed
rm -rf %{_var}/lib/nxserver/failed
- chown -R nx:root ${NX_SESS_DIR}
+ chown -R nx:root $NX_SESS_DIR
fi
-chown -R nx:root ${NX_ETC_DIR}
-chown -R nx:root ${NX_HOME_DIR}
-chown nx:root ${NX_LOGFILE}
+chown -R nx:root $NX_ETC_DIR
+chown -R nx:root $NX_HOME_DIR
+chown nx:root $NX_LOGFILE
%preun
if [ $1 = 0 ]
@@ -113,8 +110,8 @@
rm %{_var}/lib/nxserver/db/closed/* > /dev/null 2>&1
rm %{_var}/lib/nxserver/db/running/* > /dev/null 2>&1
rm %{_var}/lib/nxserver/db/failed/* > /dev/null 2>&1
- mv -f ${NX_HOME_DIR}/.ssh/client.id_dsa.key /etc/nxserver/ > /dev/null 2>&1
- mv -f ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key /etc/nxserver/ > /dev/null 2>&1
+ mv -f $NX_HOME_DIR/.ssh/client.id_dsa.key /etc/nxserver/ > /dev/null 2>&1
+ mv -f $NX_HOME_DIR/.ssh/server.id_dsa.pub.key /etc/nxserver/ > /dev/null 2>&1
fi
%files
@@ -130,6 +127,8 @@
%dir %{_var}/lib/nxserver/db/failed
%changelog
+* Wed Jun 07 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-0.2.test7
+- fixed variable/macro inconsistencies
* Tue Jun 06 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-0.1.test7
- reworked spec for fedora-extras
* Wed May 05 2006 Rick Stout <zipsonic[AT]gmail.com> 0.4.9-0.5.0-test7.0.FC5.1
More information about the fedora-extras-commits
mailing list