[X2Go-Commits] [x2goclient] 01/01: x2goclient.spec: openSUSE as /etc/apache2 as config dir for Apache, not /etc/httpd.

git-admin at x2go.org git-admin at x2go.org
Tue Oct 14 19:24:54 CEST 2014


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

x2go pushed a commit to branch master
in repository x2goclient.

commit dee7f3b940e751de60ac09bd2085692de2267d3e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 14 19:24:51 2014 +0200

    x2goclient.spec: openSUSE as /etc/apache2 as config dir for Apache, not /etc/httpd.
---
 x2goclient.spec |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/x2goclient.spec b/x2goclient.spec
index 1e13173..f676474 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -158,7 +158,11 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+%if 0%{suse_version}
+ln -s ../../x2go/x2goplugin-apache.conf %{buildroot}%{_sysconfdir}/apache2/conf.d/x2goplugin-provider.conf
+%else
 ln -s ../../x2go/x2goplugin-apache.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/x2goplugin-provider.conf
+%endif
 
 %if 0%{?suse_version}
 %suse_update_desktop_file -r x2goclient Utility WebUtility
@@ -209,7 +213,13 @@ fi
 %files -n x2goplugin-provider
 %defattr(-,root,root)
 # Link
+%if 0%{suse_version}
+%dir %{_sysconfdir}/apache2/conf.d/
+%{_sysconfdir}/apache2/conf.d/x2goplugin-provider.conf
+%else
+%dir %{_sysconfdir}/httpd/conf.d/
 %{_sysconfdir}/httpd/conf.d/x2goplugin-provider.conf
+%endif
 %dir %{_sysconfdir}/x2go
 %dir %{_sysconfdir}/x2go/plugin-provider
 %config(noreplace) %{_sysconfdir}/x2go/plugin-provider/x2goplugin.html

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


More information about the x2go-commits mailing list