This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/build-main in repository x2goserver. at 350090e x2goserver.spec: change deprecated and removed PreReq to Requires(pre) header. This branch includes the following new commits: new 98aa750 x2goserver.spec: Do not search for unavailable file in x2goserver's post install script. new 6f0dd88 x2goserver.spec: add support for %{_datadir}/applications symlink in %{_sysconfdir}/x2go. new 8c55394 x2goserver.spec: don't use %{_sbindir} for chkconfig and service on SLE{S,D}. new 350090e x2goserver.spec: change deprecated and removed PreReq to Requires(pre) header. The 4 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. -- 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 bugfix/build-main in repository x2goserver. commit 98aa75096228d573d222f960208fe5646aafcb39 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 5 01:57:43 2015 +0100 x2goserver.spec: Do not search for unavailable file in x2goserver's post install script. Fixes installation bugs reported by Michael DePaulo. --- debian/changelog | 6 ++++++ x2goserver.spec | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8014b15..1323aca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -133,6 +133,12 @@ x2goserver (4.0.1.19-0x2go1) unstable; urgency=medium * New upstream version (4.0.1.19): - Use "printf" instead of "echo -n". (Fixes: #668). + [ Mihai Moldovan ] + * New upstream version (4.0.1.21): + * x2goserver.spec: + - Do not search for unavailable file in x2goserver's post + install script. Fixes installation bugs reported by Michael DePaulo. + -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 21:49:22 +0100 x2goserver (4.0.1.18-0x2go1) unstable; urgency=medium diff --git a/x2goserver.spec b/x2goserver.spec index 0b89c98..66f3228 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -372,7 +372,6 @@ fi %post # Initialize the session database if [ ! -s %{_localstatedir}/lib/x2go/x2go_sessions ]; then - if [ -d %{_datadir}/doc/packages/perl-X2Go-Server-DB ]; then if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>&1; then %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>&1 || : fi -- 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 bugfix/build-main in repository x2goserver. commit 6f0dd8819605249283f7711bf19910c9b9a82d73 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 5 04:03:01 2015 +0100 x2goserver.spec: add support for %{_datadir}/applications symlink in %{_sysconfdir}/x2go. - Add creation and deletion bits to %post and %preun scriptlets. - Refactor %post, %pre, %postun and %preun scriptlets to accommodate for last change. --- debian/changelog | 4 ++++ x2goserver.spec | 36 ++++++++++++++++++++++++------------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1323aca..5a7ffcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -138,6 +138,10 @@ x2goserver (4.0.1.19-0x2go1) unstable; urgency=medium * x2goserver.spec: - Do not search for unavailable file in x2goserver's post install script. Fixes installation bugs reported by Michael DePaulo. + - Add support for %{_datadir}/applications symlink in %{_sysconfdir}/x2go. + + Add creation and deletion bits to %post and %preun scriptlets. + + Refactor %post, %pre, %postun and %preun scriptlets to accommodate for + last change. -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 21:49:22 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 66f3228..9579297 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -392,37 +392,49 @@ fi %endif %endif +# create /etc/x2go/applications symlink if not already there +# as a regular file, as a symlink, as a special file or as a directory +if ! [ -e %{_sysconfdir}/x2go/applications ]; then + ln -s %{_datadir}/applications %{_sysconfdir}/x2go/applications +fi + %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 %if 0%{?fedora} || 0%{?rhel} >= 7 %systemd_post x2goserver.service +%else +%service_add_post x2goserver.service +%endif +%else +%{_sbindir}/chkconfig --add x2goserver +%{_sbindir}/service x2goserver condrestart 1>/dev/null 2>&1 || : +%endif %preun +if [ -L %{_sysconfdir}/x2go/applications ]; then + rm -f %{_sysconfdir}/x2go/applications || : +fi + +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 +%if 0%{?fedora} || 0%{?rhel} >= 7 %systemd_preun x2goserver.service %postun %systemd_postun x2goserver.service %else -%service_add_post x2goserver.service - -%preun %service_del_preun x2goserver.service %postun %service_del_postun x2goserver.service %endif %else -/sbin/chkconfig --add x2goserver -/sbin/service x2goserver condrestart 1>/dev/null 2>&1 || : +if [ "$1" = 0 ]; then + %{_sbindir}/service x2goserver stop 1>/dev/null 2>&1 + %{_sbindir}/chkconfig --del x2goserver +fi %postun if [ "$1" -ge "1" ] ; then - /sbin/service x2goserver condrestart 1>/dev/null 2>&1 || : -fi - -%preun -if [ "$1" = 0 ]; then - /sbin/service x2goserver stop 1>/dev/null 2>&1 - /sbin/chkconfig --del x2goserver + %{_sbindir}/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
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 8c55394df3b7825cf336a9c5359844692851bc41 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 5a7ffcf..742855e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -142,6 +142,9 @@ x2goserver (4.0.1.19-0x2go1) unstable; urgency=medium + 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 21:49:22 +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
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 350090eaace2d2579f05ff7b2ab818069f18ab69 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 6 04:58:18 2015 +0100 x2goserver.spec: change deprecated and removed PreReq to Requires(pre) header. --- debian/changelog | 1 + x2goserver.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 742855e..4e991bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -145,6 +145,7 @@ x2goserver (4.0.1.19-0x2go1) unstable; urgency=medium + 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/. + - Change deprecated and removed PreReq to Requires(pre) header. -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 21:49:22 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 3f2be93..463ffa0 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -259,7 +259,7 @@ Group: Productivity/Networking/Remote Desktop Summary: X2Go Server (file manager bindings) Requires: %{name} = %{version}-%{release} %if 0%{?suse_version} || 0%{?suse_version} <= 1130 -PreReq: shared-mime-info +Requires(pre): shared-mime-info %endif Requires: xdg-utils Requires: desktop-file-utils -- 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