This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/build-main in repository x2goserver. discards 350090e x2goserver.spec: change deprecated and removed PreReq to Requires(pre) header. discards 8c55394 x2goserver.spec: don't use %{_sbindir} for chkconfig and service on SLE{S,D}. discards 6f0dd88 x2goserver.spec: add support for %{_datadir}/applications symlink in %{_sysconfdir}/x2go. discards 98aa750 x2goserver.spec: Do not search for unavailable file in x2goserver's post install script. new 628c640 x2goserver.spec: Do not search for unavailable file in x2goserver's post install script. new 5459355 x2goserver.spec: add support for %{_datadir}/applications symlink in %{_sysconfdir}/x2go. new 95a8b3e x2goserver.spec: don't use %{_sbindir} for chkconfig and service on SLE{S,D}. new 49d4315 x2goserver.spec: change deprecated and removed PreReq to Requires(pre) header. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (350090e) \ N -- N -- N refs/heads/bugfix/build-main (49d4315) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. 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. Summary of changes: debian/changelog | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 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 bugfix/build-main in repository x2goserver. commit 628c640ee7769d8d64ed39bc2591e5da8db57995 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 | 10 ++++++++++ x2goserver.spec | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8014b15..5ff8534 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +x2goserver (4.0.1.19-0x2go2) UNRELEASED; urgency=low + + [ Mihai Moldovan ] + * New upstream version (4.0.1.19): + * 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> Fri, 06 Mar 2015 05:37:18 +0100 + x2goserver (4.0.1.19-0x2go1) unstable; urgency=medium [ Mike Gabriel ] 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 5459355181edf1c8e887e1164901b66cb1531f82 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 5ff8534..39ad319 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ x2goserver (4.0.1.19-0x2go2) UNRELEASED; urgency=low * 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> Fri, 06 Mar 2015 05:37:18 +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 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
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 49d431516bf7042cee75d9dda2845448c69d8449 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 f3fb2c1..5f19256 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ x2goserver (4.0.1.19-0x2go2) UNRELEASED; urgency=low + 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> Fri, 06 Mar 2015 05:37:18 +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