This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/build-main in repository x2goserver. commit 95a8b3e18cad780f6a1f7860976485e8bbfe904f 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 39ad319..f3fb2c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ x2goserver (4.0.1.19-0x2go2) 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> Fri, 06 Mar 2015 05:37:18 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 9579297..3f2be93 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