This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from 63900ca x2goserver.spec: add support for %{_datadir}/applications symlink in %{_sysconfdir}/x2go. new 8c556c1 x2goserver.spec: don't use %{_sbindir} for chkconfig and service on SLE{S,D}. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ x2goserver.spec | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 8c556c166180df881a40b10450485c35c0ab0b25 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 5 05:08:31 2015 +0100 x2goserver.spec: don't use %{_sbindir} for chkconfig and service on SLE{S,D}. - %{_sbindir} is a macro for /usr/sbin/, whereas chkconfig and service reside in /sbin/. --- debian/changelog | 3 +++ x2goserver.spec | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index de53d81..370daf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low + Add creation and deletion bits to %post and %preun scriptlets. + Refactor %post, %pre, %postun and %preun scriptlets to accommodate for last change. + + Don't use %{_sbindir} for chkconfig and service on SLE{S,D}. + %{_sbindir} is a macro for /usr/sbin/, whereas chkconfig and service + reside in /sbin/. -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 22:11:49 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index a5dcf1d..0c54adf 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -405,8 +405,9 @@ fi %service_add_post x2goserver.service %endif %else -%{_sbindir}/chkconfig --add x2goserver -%{_sbindir}/service x2goserver condrestart 1>/dev/null 2>&1 || : +# Do not use %{_sbindir} here. It's a macro for /usr/sbin. +/sbin/chkconfig --add x2goserver +/sbin/service x2goserver condrestart 1>/dev/null 2>&1 || : %endif %preun @@ -428,13 +429,13 @@ fi %endif %else if [ "$1" = 0 ]; then - %{_sbindir}/service x2goserver stop 1>/dev/null 2>&1 - %{_sbindir}/chkconfig --del x2goserver + /sbin/service x2goserver stop 1>/dev/null 2>&1 + /sbin/chkconfig --del x2goserver fi %postun if [ "$1" -ge "1" ] ; then - %{_sbindir}/service x2goserver condrestart 1>/dev/null 2>&1 || : + /sbin/service x2goserver condrestart 1>/dev/null 2>&1 || : fi %endif -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org