[freenx-server] Clean up list of installed files.

Ville Skyttä scop at fedoraproject.org
Wed Aug 17 18:54:30 UTC 2011


commit ae2c059d2e6c1f61350d3a8551bde863b4d66681
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Aug 17 16:53:43 2011 +0300

    Clean up list of installed files.

 freenx-server.spec |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/freenx-server.spec b/freenx-server.spec
index 1282edb..36ba94b 100644
--- a/freenx-server.spec
+++ b/freenx-server.spec
@@ -84,16 +84,17 @@ touch \
 
 # Create the nx user home
 mkdir -p %{buildroot}/var/lib/nxserver/home/.ssh
+chmod -R 0700 %{buildroot}/var/lib/nxserver
 ln -s /etc/nxserver/server.id_dsa.pub.key \
   %{buildroot}/var/lib/nxserver/home/.ssh/authorized_keys2
 ln -s /etc/nxserver/server.id_dsa.pub.key \
   %{buildroot}/var/lib/nxserver/home/.ssh/authorized_keys2.disabled
-chmod 0700 %{buildroot}/var/lib/nxserver/home{,/.ssh}
 touch %{buildroot}/var/lib/nxserver/home/.ssh/known_hosts
+chmod 0600 %{buildroot}/var/lib/nxserver/home/.ssh/known_hosts
 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 -R 0700 %{buildroot}/var/lib/nxserver
+chmod -R 0700 %{buildroot}/var/lib/nxserver/db
 
 mkdir -p %{buildroot}/var/log/nx
 chmod 0700 %{buildroot}/var/log/nx
@@ -128,19 +129,24 @@ fi
 %{_pkglibexecdir}/*
 %{_pkglibdir}/*
 /usr/lib/cups/backend/nxsmb
-%dir %attr(-,nx,root) /etc/nxserver
 /etc/nxserver/node.conf.sample
 %config(noreplace) /etc/nxserver/node.conf
-%ghost %attr(-,nx,root) /etc/nxserver/users.id_dsa
-%ghost %attr(-,nx,root) /etc/nxserver/users.id_dsa.pub
-%ghost %attr(-,nx,root) /etc/nxserver/client.id_dsa.key
-%ghost %attr(-,nx,root) /etc/nxserver/server.id_dsa.pub.key
-%attr(-,nx,root) /var/lib/nxserver
-%ghost %attr(-,nx,root) /var/lib/nxserver/home/.ssh/authorized_keys2
-%ghost %attr(-,nx,root) /var/lib/nxserver/home/.ssh/known_hosts
-%attr(-,nx,root) /var/log/nx
 %config(noreplace) %{_sysconfdir}/logrotate.d/freenx-server
 %{_sysconfdir}/init.d/freenx-server
+%defattr(-,nx,root,-)
+%dir /etc/nxserver
+%ghost /etc/nxserver/users.id_dsa
+%ghost /etc/nxserver/users.id_dsa.pub
+%ghost /etc/nxserver/client.id_dsa.key
+%ghost /etc/nxserver/server.id_dsa.pub.key
+%dir /var/lib/nxserver
+/var/lib/nxserver/db
+%dir /var/lib/nxserver/home
+%dir /var/lib/nxserver/home/.ssh
+%ghost /var/lib/nxserver/home/.ssh/authorized_keys2
+/var/lib/nxserver/home/.ssh/authorized_keys2.disabled
+%ghost /var/lib/nxserver/home/.ssh/known_hosts
+/var/log/nx
 
 %changelog
 * Wed Aug 17 2011 Ville Skyttä <ville.skytta at iki.fi>
@@ -149,6 +155,7 @@ fi
 - Fix default CUPS config dir on Fedora and EL-6+.
 - Build everything with %%{optflags}.
 - Use %%global instead of %%define.
+- Clean up list of installed files.
 
 * Mon Jun 20 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-22
 - Fix nxdialog when /usr/bin/dialog is available but xterm isn't (#627010).


More information about the scm-commits mailing list