Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2018-03-13 10:21:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdm (Old)
and /work/SRC/openSUSE:Factory/.xdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm"
Tue Mar 13 10:21:56 2018 rev:68 rq:585124 version:1.1.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2018-02-28 20:00:40.948412980
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2018-03-13
10:21:58.890192255 +0100
@@ -1,0 +2,7 @@
+Fri Mar 9 16:46:58 UTC 2018 - sndir...@suse.com
+
+- check for available graphics during runtime instead of %post,
+ since %post may already run during image building time in our
+ buildsystem (boo#1039497)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdm.spec ++++++
--- /var/tmp/diff_new_pack.jeyefg/_old 2018-03-13 10:22:01.498098824 +0100
+++ /var/tmp/diff_new_pack.jeyefg/_new 2018-03-13 10:22:01.502098681 +0100
@@ -160,6 +160,7 @@
%endif
%if 0%{?suse_version} >= 1330
patch -p1 < %{PATCH2}
+rm -f usr/lib/X11/display-manager.orig
%endif
%if "%{_fillupdir}" != "/var/adm/fillup-templates"
mkdir -p %{buildroot}$(dirname %{_fillupdir})
@@ -217,14 +218,6 @@
%service_add_post display-manager.service
%{fillup_only -n displaymanager}
%endif
-# Do no try to start Xserver on platforms which may ship without
-# graphics card (bsc#1039497)
-%ifarch aarch64 ppc64le
-if ! [ -c /dev/fb* -o -d /dev/dri ]; then
- sed -i -e
"s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
- %{_sysconfdir}/sysconfig/displaymanager
-fi
-%endif
%if 0%{?suse_version} >= 1330
%{_sbindir}/update-alternatives --install
%{_libexecdir}/X11/displaymanagers/default-displaymanager \
default-displaymanager %{_libexecdir}/X11/displaymanagers/console 5
++++++ xdm.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/display-manager
new/usr/lib/X11/display-manager
--- old/usr/lib/X11/display-manager 2017-12-04 12:23:07.871605000 +0100
+++ new/usr/lib/X11/display-manager 2018-03-09 17:41:53.635601000 +0100
@@ -75,12 +75,24 @@
xdm_reload_files () {
- test -x /etc/X11/xdm/SuSEconfig.xdm && \
+ if [ -x /etc/X11/xdm/SuSEconfig.xdm ]; then
+ # Do no try to start Xserver on platforms which may ship without
+ # graphics card (bsc#1039497)
+ if [ "$(arch)" == "aarch64" -o "$(arch)" == "ppc64le" ]; then
+ if ! [ -c /dev/fb* -o -d /dev/dri ]; then
+ sed -i -e
"s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
+ /etc/sysconfig/displaymanager
+ else
+ sed -i -e
"s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"yes\"+g" \
+ /etc/sysconfig/displaymanager
+ fi
+ fi
MD5DIR="/var/adm/SuSEconfig/md5" \
/etc/X11/xdm/SuSEconfig.xdm | \
sed 's+\(.*\)+/etc/init.d/xdm: \1+g' | \
/bin/logger
return 0
+ fi
}
splashcopy()
