From 3491b2bf9586fcabf556f2539693986743366db640379762072c2eeaf3eefcb1 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 24 Jul 2017 13:44:33 +0000 Subject: [PATCH 1/5] - %post * Do no try to start Xserver on platforms which may ship without graphics card (bsc#1039497) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=144 --- xdm.changes | 7 +++++++ xdm.spec | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/xdm.changes b/xdm.changes index ce5f237..754e6f3 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 24 13:43:35 UTC 2017 - sndirsch@suse.com + +- %post + * Do no try to start Xserver on platforms which may ship without + graphics card (bsc#1039497) + ------------------------------------------------------------------- Mon Feb 6 13:20:21 UTC 2017 - sndirsch@suse.com diff --git a/xdm.spec b/xdm.spec index 3fe8100..31435c4 100644 --- a/xdm.spec +++ b/xdm.spec @@ -173,6 +173,14 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %endif %post +# 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" \ + var/adm/fillup-templates/sysconfig.displaymanager +fi +%endif %if 0%{?suse_version} < 1315 %{fillup_and_insserv -Y xdm} %else From 83d1ec3cc2efc9bd1552e6bd2dd3bac0e772a2669d869e2278baa080ca2390d6 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 24 Jul 2017 14:23:57 +0000 Subject: [PATCH 2/5] - %post * make previous change in /etc/sysconfig/displaymanager instead of /var/adm/fillup-templates/sysconfig.displaymanager OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=145 --- xdm.changes | 7 +++++++ xdm.spec | 16 ++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/xdm.changes b/xdm.changes index 754e6f3..4c81fd4 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 24 14:21:45 UTC 2017 - sndirsch@suse.com + +- %post + * make previous change in /etc/sysconfig/displaymanager instead + of /var/adm/fillup-templates/sysconfig.displaymanager + ------------------------------------------------------------------- Mon Jul 24 13:43:35 UTC 2017 - sndirsch@suse.com diff --git a/xdm.spec b/xdm.spec index 31435c4..c77dbc3 100644 --- a/xdm.spec +++ b/xdm.spec @@ -173,20 +173,20 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %endif %post -# 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" \ - var/adm/fillup-templates/sysconfig.displaymanager -fi -%endif %if 0%{?suse_version} < 1315 %{fillup_and_insserv -Y xdm} %else %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" \ + /etc/sysconfig/displaymanager +fi +%endif %pre %if !0%{?suse_version} < 1315 From e67a4fc6baeba10c9adc50fbf3137434d99dda83e0ecbffedddb137011dda239 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 25 Jul 2017 10:00:19 +0000 Subject: [PATCH 3/5] - fix usage of readlink in Xsession (boo#1050328) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=146 --- xdm.changes | 5 +++++ xdm.tar.bz2 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xdm.changes b/xdm.changes index 4c81fd4..b52db0a 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 25 09:58:56 UTC 2017 - sndirsch@suse.com + +- fix usage of readlink in Xsession (boo#1050328) + ------------------------------------------------------------------- Mon Jul 24 14:21:45 UTC 2017 - sndirsch@suse.com diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index ae63771..c7641e8 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2bf6b280a31f4a00954670b064abae45da0c76c785c845d712169f38e11af00 -size 22930 +oid sha256:d59ef63f70affbfc4311270cebcb14efdf08e65cbe520fe8bb013a6cd4d55f0b +size 22914 From 52c7238da4a0987457ee21d7c696f0cab20bfdb27d57f8fdd5a97d8a88e3d328 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 28 Jul 2017 07:40:17 +0000 Subject: [PATCH 4/5] Updating link to change in openSUSE:Factory/xdm revision 60.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=f14ac76e07673882a77916a2bc06a642 --- xdm.changes | 19 +++++++++++++++++++ xdm.spec | 8 ++++++++ 2 files changed, 27 insertions(+) diff --git a/xdm.changes b/xdm.changes index b52db0a..74071f4 100644 --- a/xdm.changes +++ b/xdm.changes @@ -13,6 +13,25 @@ Mon Jul 24 14:21:45 UTC 2017 - sndirsch@suse.com ------------------------------------------------------------------- Mon Jul 24 13:43:35 UTC 2017 - sndirsch@suse.com +- %post + * Do no try to start Xserver on platforms which may ship without + graphics card (bsc#1039497) + +------------------------------------------------------------------- +Tue Jul 25 09:58:56 UTC 2017 - sndirsch@suse.com + +- fix usage of readlink in Xsession (boo#1050328) + +------------------------------------------------------------------- +Mon Jul 24 14:21:45 UTC 2017 - sndirsch@suse.com + +- %post + * make previous change in /etc/sysconfig/displaymanager instead + of /var/adm/fillup-templates/sysconfig.displaymanager + +------------------------------------------------------------------- +Mon Jul 24 13:43:35 UTC 2017 - sndirsch@suse.com + - %post * Do no try to start Xserver on platforms which may ship without graphics card (bsc#1039497) diff --git a/xdm.spec b/xdm.spec index c77dbc3..ff7e152 100644 --- a/xdm.spec +++ b/xdm.spec @@ -187,6 +187,14 @@ if ! [ -c /dev/fb* -o -d /dev/dri ]; then /etc/sysconfig/displaymanager fi %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" \ + /etc/sysconfig/displaymanager +fi +%endif %pre %if !0%{?suse_version} < 1315 From 2b0dfe0e5ff3a354ee406d24c8e3df9e8823073003ae813de45faa1c446c07c1 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 28 Jul 2017 07:40:17 +0000 Subject: [PATCH 5/5] Accepting request 512470 from X11:XOrg auto commit by copy to link target OBS-URL: https://build.opensuse.org/request/show/512470 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=147 --- xdm.changes | 19 ------------------- xdm.spec | 8 -------- 2 files changed, 27 deletions(-) diff --git a/xdm.changes b/xdm.changes index 74071f4..b52db0a 100644 --- a/xdm.changes +++ b/xdm.changes @@ -13,25 +13,6 @@ Mon Jul 24 14:21:45 UTC 2017 - sndirsch@suse.com ------------------------------------------------------------------- Mon Jul 24 13:43:35 UTC 2017 - sndirsch@suse.com -- %post - * Do no try to start Xserver on platforms which may ship without - graphics card (bsc#1039497) - -------------------------------------------------------------------- -Tue Jul 25 09:58:56 UTC 2017 - sndirsch@suse.com - -- fix usage of readlink in Xsession (boo#1050328) - -------------------------------------------------------------------- -Mon Jul 24 14:21:45 UTC 2017 - sndirsch@suse.com - -- %post - * make previous change in /etc/sysconfig/displaymanager instead - of /var/adm/fillup-templates/sysconfig.displaymanager - -------------------------------------------------------------------- -Mon Jul 24 13:43:35 UTC 2017 - sndirsch@suse.com - - %post * Do no try to start Xserver on platforms which may ship without graphics card (bsc#1039497) diff --git a/xdm.spec b/xdm.spec index ff7e152..c77dbc3 100644 --- a/xdm.spec +++ b/xdm.spec @@ -187,14 +187,6 @@ if ! [ -c /dev/fb* -o -d /dev/dri ]; then /etc/sysconfig/displaymanager fi %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" \ - /etc/sysconfig/displaymanager -fi -%endif %pre %if !0%{?suse_version} < 1315