This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit edd544f64001be2cdfedbc2668aaa7846d783e89 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 17:16:58 2014 +0200 The macro %{_sharedstatedir} is %{_localstatedir} on SUSE build systems. Conflicts: x2goserver.spec --- debian/changelog | 1 + x2goserver.spec | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/debian/changelog b/debian/changelog index c59de3e..87fafbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,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@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/x2goserver.spec b/x2goserver.spec index df990e5..dd27f7e 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -218,10 +218,23 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} # 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 +%if 0%{suse_version} +mkdir -p %{buildroot}%{_sharedstatedir}/x2go +# Create empty session file for %%ghost +touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions +%else mkdir -p %{buildroot}%{_sharedstatedir}/x2go # Create empty session file for %%ghost touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions +%endif +%endif # Printing spool dir mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint @@ -349,8 +362,15 @@ exit 0 %dir %{_datadir}/x2go/x2gofeature.d/ %{_datadir}/x2go/x2gofeature.d/x2goserver.features %{_datadir}/x2go/versions/VERSION.x2goserver +%if 0%{suse_version} +%dir %{_localstatedir} +%attr(0775,root,x2gouser) %dir %{_localstatedir}/x2go/ +%ghost %attr(0660,root,x2gouser) %{_localstatedir}/x2go/x2go_sessions +%else +%dir %{_sharedstatedir} %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/ %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions +%endif %if 0%{?fedora} || 0%{?rhel} >= 7 %{_unitdir}/x2goserver.service %else @@ -362,6 +382,12 @@ exit 0 %endif +%if 0%{suse_version} +%dir %{_localstatedir} +%else +%dir %{_sharedstatedir} +%endif + %files extensions %{_libdir}/x2go/extensions %{_bindir}/x2goserver-run-extensions -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git