This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from a8054f6 backport a fix from release/4.0.1.x branch in x2goserver.spec: Don't let creation of x2gouser fail if it already exists. new 58bb5c3 x2goserver.spec: Requires (x2goserver-xsession): SUSE <= 11.3 has xorg-x11, not xinit. 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 | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) -- Alioth's /srv/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 master in repository x2goserver. commit 58bb5c39898d996607028e8f961f555e6bc44f86 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 07:12:49 2015 +0100 x2goserver.spec: Requires (x2goserver-xsession): SUSE <= 11.3 has xorg-x11, not xinit. --- debian/changelog | 3 ++- x2goserver.spec | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9ca8f94..0d12563 100644 --- a/debian/changelog +++ b/debian/changelog @@ -250,7 +250,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium Fedora/RHEL7. (Fixes: 698). + Create system user x2gouser with $HOME in /var/lib/x2go. (Fixes: #697). + Always set BuildRoot: parameter. - + BuildRequires: SUSE <= 11.3 has xorg-x11, xinit. + + BuildRequires: SUSE <= 11.3 has xorg-x11, not xinit. + + Requires (x2goserver-xsession): SUSE <= 11.3 has xorg-x11, not xinit. + No Bashisms in scriptlets. + rpmlint requires xdg-utils at build time. diff --git a/x2goserver.spec b/x2goserver.spec index 255f6d0..f1c6151 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -340,7 +340,11 @@ Summary: X2Go Server (Xsession runner) Requires: %{name} = %{version}-%{release} # For /etc/X11/Xresources %if 0%{?suse_version} +%if 0%{?suse_version} <= 1130 +Requires: xorg-x11 +%else Requires: xinit +%endif %else Requires: xorg-x11-xinit %endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org