[X2Go-Commits] [x2gobroker] 01/01: x2gobroker.spec: make sure .service files get installed, make sure that SystemV default configuration files are not installed on distros that use systemd

[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 20ba2899add0ccb7cb44b43384ec9c05e2a03e8d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 25 10:47:02 2014 +0100

    x2gobroker.spec: make sure .service files get installed, make sure that SystemV default configuration files are not installed on distros that use systemd
---
 x2gobroker.spec |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/x2gobroker.spec b/x2gobroker.spec
index 5965d89..4472656 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -258,6 +258,8 @@ ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost" \
 mkdir -p %{buildroot}%{_unitdir}
 install -pm0644 x2gobroker-daemon.service %{buildroot}%{_unitdir}
 install -pm0644 x2gobroker-authservice.service %{buildroot}%{_unitdir}
+rm -f %_sysconfdir/default/x2gobroker-daemon
+rm -f %_sysconfdir/default/x2gobroker-authservice
 %else
 # SysV session cleanup script
 %if 0%{?el5}
@@ -381,6 +383,9 @@ fi;
 %if 0%{?el6}
 %_initddir/x2gobroker-authservice
 %endif
+%if 0%{?fedora} || 0%{?el7}
+%{_unitdir}/x2gobroker-authservicedaemon.service
+%endif
 %if 0%{?el5} || 0%{?el6}
 %config %_sysconfdir/default/x2gobroker-authservice
 %endif
@@ -398,12 +403,17 @@ fi;
 %if 0%{?el6}
 %_initddir/x2gobroker-daemon
 %endif
+%if 0%{?fedora} || 0%{?el7}
+%{_unitdir}/x2gobroker-daemon.service
+%endif
 %if 0%{?el5} || 0%{?el6}
 %config %_sysconfdir/default/x2gobroker-daemon
 %endif
 %_sbindir/x2gobroker-daemon-debug
 %_mandir/man8/x2gobroker-daemon-debug.8*
-
+mkdir -p %{buildroot}%{_unitdir}
+install -pm0644 %SOURCE1 %{buildroot}%{_unitdir}
+%{_unitdir}/x2goserver.service
 
 %files wsgi
 %defattr(-,root,root)

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