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 71c053ad7094bb4fec8a6cd47afca4e8c2744a02 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 17:24:12 2014 +0200 Use %{_localstatedir} instead of %{_sharedstatedir}. --- debian/changelog | 2 +- x2goserver.spec | 27 +-------------------------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index 87fafbd..a0f109f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +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. + + Use %{_localstatedir} instead of %{_sharedstatedir}. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/x2goserver.spec b/x2goserver.spec index dd27f7e..cd5e41c 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -218,23 +218,10 @@ 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 @@ -270,7 +257,7 @@ exit 0 %post # Initialize the session database -[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && \ +[ ! -s %{_localstatedir}/x2go/x2go_sessions ] && \ egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && \ %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : @@ -362,15 +349,9 @@ 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 @@ -382,12 +363,6 @@ 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