[X2Go-Commits] [x2gobroker] 01/01: x2gobroker.spec: more rpmlintrc improvements

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 620a2b9e7152ece538908e20d68a2e2411eb55e8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 15 07:17:17 2014 +0200

    x2gobroker.spec: more rpmlintrc improvements
---
 x2gobroker.spec |   46 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/x2gobroker.spec b/x2gobroker.spec
index fc0d92c..2b02faf 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -114,7 +114,8 @@ Requires:       python-argparse
 Requires:       python-setproctitle
 Requires:       python-pampy
 Requires:       logrotate
-Requires(pre):       python-x2gobroker = %{version}-%{release}
+Requires(pre):  python-x2gobroker = %{version}-%{release}
+Requires(pre):  permissions
 
 %description authservice
 X2Go is a server based computing environment with
@@ -144,6 +145,7 @@ Group:          Applications/Communications
 Requires:       x2gobroker = %{version}-%{release}
 Requires:       x2gobroker-authservice = %{version}-%{release}
 Requires:       logrotate
+Requires(pre):  permissions
 
 %description daemon
 X2Go is a server based computing environment with
@@ -214,6 +216,7 @@ Requires:       python2
 %endif
 Requires:       x2gobroker-authservice = %{version}-%{release}
 Requires:       logrotate
+Requires(pre):  permissions
 
 %description wsgi
 X2Go is a server based computing environment with
@@ -384,11 +387,11 @@ fi
 
 %if 0%{?suse_version}
 %post -n python-x2gobroker
-%set_permissions
+%set_permissions /var/log/x2gobroker
 
 
 %verifyscript -n python-x2gobroker
-%verify_permissions
+%verify_permissions -e /var/log/x2gobroker
 %endif
 
 
@@ -410,6 +413,13 @@ if [ "$1" -ge "1" ] ; then
     /sbin/service x2gobroker-authservice condrestart >/dev/null 2>&1 || :
 fi
 %endif
+%if 0%{?suse_version}
+%set_permissions /var/log/x2gobroker
+
+
+%verifyscript authservice
+%verify_permissions -e /var/log/x2gobroker
+%endif
 
 %preun authservice
 %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
@@ -453,6 +463,13 @@ if [ "$1" -ge "1" ] ; then
     /sbin/service x2gobroker-daemon condrestart >/dev/null 2>&1 || :
 fi
 %endif
+%if 0%{?suse_version}
+%set_permissions /var/log/x2gobroker
+
+
+%verifyscript daemon
+%verify_permissions -e /var/log/x2gobroker
+%endif
 
 %preun daemon
 %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
@@ -483,11 +500,11 @@ if ! /usr/bin/getent group x2gobroker-users 1>/dev/null 2>/dev/null; then
 	/usr/sbin/groupadd -r x2gobroker-users
 fi
 %if 0%{?suse_version}
-%set_permissions
+%set_permissions /usr/bin/x2gobroker-ssh
 
 
 %verifyscript ssh
-%verify_permissions
+%verify_permissions -e /usr/bin/x2gobroker-ssh
 %endif
 
 %pre agent
@@ -502,11 +519,23 @@ fi
 
 %if 0%{?suse_version}
 %post agent
-%set_permissions
+%set_permissions /usr/lib/x2go/x2gobroker-agent
+%set_permissions /var/log/x2gobroker
 
 
 %verifyscript agent
-%verify_permissions
+%verify_permissions -e /usr/lib/x2go/x2gobroker-agent
+%verify_permissions -e /var/log/x2gobroker
+%endif
+
+
+%if 0%{?suse_version}
+%post wsgi
+%set_permissions /var/log/x2gobroker
+
+
+%verifyscript wsgi
+%verify_permissions -e /var/log/x2gobroker
 %endif
 
 
@@ -552,6 +581,7 @@ fi
 %config %_sysconfdir/logrotate.d/x2gobroker-authservice
 %_sbindir/x2gobroker-authservice
 %_mandir/man8/x2gobroker-authservice.8*
+%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker
 
 
 %files daemon
@@ -573,6 +603,7 @@ fi
 %_mandir/man1/x2gobroker-daemon.1*
 %_mandir/man8/x2gobroker-daemon-debug.8*
 %config %_sysconfdir/logrotate.d/x2gobroker-daemon
+%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker
 
 
 %files ssh
@@ -588,6 +619,7 @@ fi
 %else
 %_sysconfdir/httpd
 %endif
+%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker
 %config %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf
 %config %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost
 %config %_sysconfdir/logrotate.d/x2gobroker-wsgi

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git