[X2Go-Commits] [x2gobroker] 01/01: fix for last commit

[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 3652b8cff38fe2deb53f46500f3454dc60f2fc47
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 28 18:18:40 2014 +0100

    fix for last commit
---
 x2gobroker.spec |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x2gobroker.spec b/x2gobroker.spec
index 4853f03..06550e1 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -366,6 +366,7 @@ install -pm0644 x2gobroker-daemon.service %{buildroot}%{_unitdir}
 install -pm0644 x2gobroker-authservice.service %{buildroot}%{_unitdir}
 rm -f %{buildroot}%{_sysconfdir}/default/x2gobroker-daemon
 rm -f %{buildroot}%{_sysconfdir}/default/x2gobroker-authservice
+rm -f %{buildroot}%{_sysconfdir}/default/python-x2gobroker
 %else
 # SysV session cleanup script
 %if 0%{?el5}
@@ -577,7 +578,9 @@ fi
 %exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf
 %exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost
 %config %_sysconfdir/pam.d
+%if 0%{?el5} || 0%{?el6} || 0%{?suse_version} < 1140
 %config %_sysconfdir/default/python-x2gobroker
+%endif
 %python_sitelib/x2gobroker*
 %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker
 %attr(00750,x2gobroker,x2gobroker) %_localstatedir/lib/x2gobroker
@@ -614,7 +617,6 @@ fi
 %endif
 %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
 %{_unitdir}/x2gobroker-daemon.service
-%config %_sysconfdir/x2go/broker/defaults.conf
 %endif
 %if 0%{?el5} || 0%{?el6} || 0%{?suse_version} < 1140
 %config %_sysconfdir/default/x2gobroker-daemon

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