[X2Go-Commits] [x2goadmincenter] 01/01: Make sure x2gorpcserver.cgi is executabe on SUSE systems.

[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 x2goadmincenter.

commit f9844a5a615fd8a8abe829e9d091aac540f04c33
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 15 10:20:54 2014 +0200

    Make sure x2gorpcserver.cgi is executabe on SUSE systems.
---
 debian/changelog     |    1 +
 x2goadmincenter.spec |   20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eebf09b..80e5025 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low
     + Set Categories= field in x2goadmincenter.desktop to
       Qt;KDE;Application;System;RemoteAccess;.
     + Don't package x2goadmincenter.8 man page in both bin:packages.
+    + Make sure x2gorpcserver.cgi is executabe on SUSE systems.
 
   [ Martti Pitkanen ]
   * Upstream version 0.0.0.1 (initial release):
diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec
index 48ca3ca..03adc1c 100644
--- a/x2goadmincenter.spec
+++ b/x2goadmincenter.spec
@@ -56,7 +56,12 @@ multi-server based X2Go clusters.
 
 %package -n x2goadminserver
 Summary:        X2Go Administration Server (Perl/CGI)
+%if 0%{?suse_version}
+Group:          Production/Network/Remote Desktop
+Requires(pre):  permissions
+%else
 Group:          Applications/System
+%endif
 
 %description -n x2goadminserver
 X2Go is a serverbased computing environment with
@@ -101,6 +106,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %postun
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -111,6 +117,16 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
+%if 0%{?suse_version}
+%post -n x2goadminserver
+%set_permissions {_libdir}/cgi-bin/x2gorpcserver.cgi
+
+
+%verifyscript -n x2goadminserver
+%verify_permissions -e {_libdir}/cgi-bin/x2gorpcserver.cgi
+%endif
+
+
 %files
 %defattr(-,root,root)
 %doc debian/changelog
@@ -143,10 +159,10 @@ fi
 %files -n x2goadminserver
 %defattr(-,root,root)
 %dir %{_sysconfdir}/x2go/
-%{_sysconfdir}/x2go/x2goadminserver.conf
+%config %{_sysconfdir}/x2go/x2goadminserver.conf
 %dir %{_libdir}/x2go/
 %{_libdir}/x2go/
-%{_libdir}/cgi-bin/
+%attr(0755,root,root) %{_libdir}/cgi-bin/x2gorpcserver.cgi
 %{_mandir}/man5/x2go*.5.gz
 %{_mandir}/man8/x2go*.8.gz
 %exclude %{_mandir}/man8/%{name}.8*

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