[X2Go-Commits] [x2goserver] 01/02: The macro %{_sharedstatedir} is %{_localstatedir} on SUSE build 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 x2goserver.

commit e9435ea6c6fbcb98727769b28c2860653ff8fb33
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 13 17:16:58 2014 +0200

    The macro %{_sharedstatedir} is %{_localstatedir} on SUSE build systems.
---
 debian/changelog |    1 +
 x2goserver.spec  |   12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c97ae25..9da7567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -162,6 +162,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
     + Add to R: x2goserver-xsession.
     + Don't mention /etc/x2go/x2gosql/sql twice (directly and with wildcard).
     + No %{_sysconfdir}/x2go/Xclients.d on SUSE systems.
+    + The macro %{_sharedstatedir} is %{_localstatedir} on SUSE build systems.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 07 Oct 2014 15:35:38 +0200
 
diff --git a/x2goserver.spec b/x2goserver.spec
index 1b98ced..ad8d8e5 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -311,10 +311,17 @@ rm -f %{buildroot}%{perl_vendorarch}/auto/x2goserver/.packlist
 # Remove placeholder files (in a way that works on EPEL-5, as well)
 find %{buildroot}%{_libdir}/x2go/extensions/ -type f -name ".placeholder" | while read file; do rm -f "$file"; done
 
+%if 0%{suse_version}
+# x2gouser homedir, state dir
+mkdir -p %{buildroot}%{_localstatedir}/x2go
+# Create empty session file for %%ghost
+touch %{buildroot}%{_localstatedir}/x2go/x2go_sessions
+%else
 # x2gouser homedir, state dir
 mkdir -p %{buildroot}%{_sharedstatedir}/x2go
 # Create empty session file for %%ghost
 touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions
+%endif
 
 # Printing spool dir
 mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint
@@ -496,6 +503,11 @@ exit 0
 
 
 %files common
+%if 0%{suse_version}
+%dir %{_localstatedir}
+%else
+%dir %{_sharedstatedir}
+%endif
 %dir %{_sysconfdir}/x2go/
 %dir %{_sysconfdir}/x2go/x2gosql
 %config(noreplace) %{_sysconfdir}/x2go/x2go*

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