SHA256
1
0
forked from pool/xdm

Accepting request 953117 from X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/953117
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=92
This commit is contained in:
Dominique Leuenberger 2022-02-11 22:07:08 +00:00 committed by Git OBS Bridge
commit 79c074edb9
2 changed files with 15 additions and 2 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Feb 9 16:55:31 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- added "Recommends: xdmbgrd" to make sure we have a background for
xdm and the xdmbgrd package is required by anyone and not silently
dropped by accident (boo#1195664)
-------------------------------------------------------------------
Tue Feb 8 08:47:28 UTC 2022 - Dirk Müller <dmueller@suse.com>
- fix bashism in postinstall script (bsc#1195391)
-------------------------------------------------------------------
Fri Nov 19 16:12:35 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package xdm
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -70,6 +70,7 @@ Requires: xset
Requires: xsetroot
Requires: xterm-bin
Recommends: dbus-1-x11
Recommends: xdmbgrd
# This was part of the xorg-x11 package up to version 7.6
Conflicts: xorg-x11 <= 7.6
%{?systemd_requires}
@ -178,7 +179,7 @@ touch %{buildroot}%{_prefix}/lib/X11/displaymanagers/console
%post
# enable Xorg on s390x with virtio (Redhat PCI ID 1af4:1050) on installation (but not upgrade)
if [ $1 -eq 1 ] ; then
if [ "$(arch)" == "s390x" ]; then
if [ "$(arch)" = "s390x" ]; then
if [ -d /dev/dri ]; then
sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"no\"+g" \
-e "s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"yes\"+g" \