From 25062b1cdfe7a9fd9a112c417916e028723cec7962c113d1cac250fa3fef8bb9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 23 Nov 2017 10:49:05 +0000 Subject: [PATCH 1/6] - xdm.tar.bz2: Fix Xstartup, that couldn't handle env DISPLAY=(null) (bsc#1068016, patch by xwang@suse.com) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=153 --- xdm.changes | 6 ++++++ xdm.tar.bz2 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xdm.changes b/xdm.changes index f86e9e9..9830a13 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 10:46:29 UTC 2017 - sndirsch@suse.com + +- xdm.tar.bz2: Fix Xstartup, that couldn't handle env DISPLAY=(null) + (bsc#1068016, patch by xwang@suse.com) + ------------------------------------------------------------------- Fri Oct 27 12:53:19 UTC 2017 - msrb@suse.com diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index b1b90e1..d7a2c48 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e33d18017a26e2f228d5a55dcc045ce3606f9be3e6e5e49fd1ca11984151a2f0 -size 23537 +oid sha256:96e37f509093dcf7f5892bb4af9cf100df37c457f707588df72c57b45a9b5e95 +size 23535 From 667b3e6bf47a89948bd2d22966e61b6e13e5935ed2fed9ffe584752987e1ec83 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 23 Nov 2017 15:08:11 +0000 Subject: [PATCH 2/6] Accepting request 544820 from home:RBrownSUSE:branches:X11:XOrg Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544820 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=154 --- xdm.changes | 6 ++++++ xdm.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/xdm.changes b/xdm.changes index 9830a13..a7593e8 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:52:48 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Thu Nov 23 10:46:29 UTC 2017 - sndirsch@suse.com diff --git a/xdm.spec b/xdm.spec index 6c09b3e..6394242 100644 --- a/xdm.spec +++ b/xdm.spec @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %define _dminitdir %{_libexecdir}/X11/displaymanagers %if 0%{?suse_version} > 1230 %define with_systemd 1 @@ -149,7 +154,7 @@ tar xf %{SOURCE3} %ifarch s390 s390x sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\"+g" \ -e "s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \ - var/adm/fillup-templates/sysconfig.displaymanager + %{buildroot}%{_fillupdir}/sysconfig.displaymanager %endif popd @@ -266,7 +271,7 @@ fi %config(noreplace) %{_sysconfdir}/pam.d/xdm %config(noreplace) %{_sysconfdir}/pam.d/xdm-np %dir %{_localstatedir}/lib/xdm/ -%{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager +%{_fillupdir}/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ %ghost %{_localstatedir}/log/xdm.errors %{_bindir}/chooser From 5e93e1843fc544521167e3e6e860ca57f5dd8afc1dd3737383fe0dd4faf83288 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 23 Nov 2017 20:28:26 +0000 Subject: [PATCH 3/6] - xdm.tar.bz2: move /var/adm/fillup-templates/sysconfig.displaymanager to /usr/share/fillup-templates` - adjusted xdm-with-update-alternative.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=155 --- xdm-with-update-alternative.patch | 6 +++--- xdm.changes | 7 +++++++ xdm.tar.bz2 | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/xdm-with-update-alternative.patch b/xdm-with-update-alternative.patch index 6180265..e75ffa0 100644 --- a/xdm-with-update-alternative.patch +++ b/xdm-with-update-alternative.patch @@ -18,9 +18,9 @@ diff -ur xdm.old/usr/lib/X11/display-manager xdm.new/usr/lib/X11/display-manager $name $DM && break; done if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ] -diff -ur xdm.old/var/adm/fillup-templates/sysconfig.displaymanager xdm.new/var/adm/fillup-templates/sysconfig.displaymanager ---- xdm.old/var/adm/fillup-templates/sysconfig.displaymanager 2017-01-04 11:15:56.259500000 +0100 -+++ xdm.new/var/adm/fillup-templates/sysconfig.displaymanager 2017-10-12 16:35:23.775259305 +0200 +diff -ur xdm.old/usr/share/fillup-templates/sysconfig.displaymanager xdm.new/var/adm/fillup-templates/sysconfig.displaymanager +--- xdm.old/usr/share/fillup-templates/sysconfig.displaymanager 2017-01-04 11:15:56.259500000 +0100 ++++ xdm.new/usr/share/fillup-templates/sysconfig.displaymanager 2017-10-12 16:35:23.775259305 +0200 @@ -1,14 +1,6 @@ ## Path: Desktop/Display manager ## Description: settings to generate a proper displaymanager config diff --git a/xdm.changes b/xdm.changes index a7593e8..8fc3d95 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 23 20:20:50 UTC 2017 - sndirsch@suse.com + +- xdm.tar.bz2: move /var/adm/fillup-templates/sysconfig.displaymanager + to /usr/share/fillup-templates` +- adjusted xdm-with-update-alternative.patch + ------------------------------------------------------------------- Thu Nov 23 13:52:48 UTC 2017 - rbrown@suse.com diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index d7a2c48..e3870e3 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96e37f509093dcf7f5892bb4af9cf100df37c457f707588df72c57b45a9b5e95 -size 23535 +oid sha256:49ba8e70cce08a27a2f09d4a1848870deb1933fa7af46f1b680110bbd437aa92 +size 23523 From 933e5b1dfb416ef06adca84eef76ede5bfaa13be9b744284b0b1989252bbdc0b Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 23 Nov 2017 20:50:44 +0000 Subject: [PATCH 4/6] - move /var/adm/fillup-templates/sysconfig.displaymanager to /usr/share/fillup-templates on TW and sle15/Leap 15 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=156 --- xdm-with-update-alternative.patch | 6 +++--- xdm.changes | 5 ++--- xdm.spec | 2 ++ xdm.tar.bz2 | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xdm-with-update-alternative.patch b/xdm-with-update-alternative.patch index e75ffa0..6180265 100644 --- a/xdm-with-update-alternative.patch +++ b/xdm-with-update-alternative.patch @@ -18,9 +18,9 @@ diff -ur xdm.old/usr/lib/X11/display-manager xdm.new/usr/lib/X11/display-manager $name $DM && break; done if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ] -diff -ur xdm.old/usr/share/fillup-templates/sysconfig.displaymanager xdm.new/var/adm/fillup-templates/sysconfig.displaymanager ---- xdm.old/usr/share/fillup-templates/sysconfig.displaymanager 2017-01-04 11:15:56.259500000 +0100 -+++ xdm.new/usr/share/fillup-templates/sysconfig.displaymanager 2017-10-12 16:35:23.775259305 +0200 +diff -ur xdm.old/var/adm/fillup-templates/sysconfig.displaymanager xdm.new/var/adm/fillup-templates/sysconfig.displaymanager +--- xdm.old/var/adm/fillup-templates/sysconfig.displaymanager 2017-01-04 11:15:56.259500000 +0100 ++++ xdm.new/var/adm/fillup-templates/sysconfig.displaymanager 2017-10-12 16:35:23.775259305 +0200 @@ -1,14 +1,6 @@ ## Path: Desktop/Display manager ## Description: settings to generate a proper displaymanager config diff --git a/xdm.changes b/xdm.changes index 8fc3d95..39bd6d1 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,9 +1,8 @@ ------------------------------------------------------------------- Thu Nov 23 20:20:50 UTC 2017 - sndirsch@suse.com -- xdm.tar.bz2: move /var/adm/fillup-templates/sysconfig.displaymanager - to /usr/share/fillup-templates` -- adjusted xdm-with-update-alternative.patch +- move /var/adm/fillup-templates/sysconfig.displaymanager + to /usr/share/fillup-templates on TW and sle15/Leap 15 ------------------------------------------------------------------- Thu Nov 23 13:52:48 UTC 2017 - rbrown@suse.com diff --git a/xdm.spec b/xdm.spec index 6394242..c833220 100644 --- a/xdm.spec +++ b/xdm.spec @@ -147,6 +147,8 @@ pushd %{buildroot} tar xf %{SOURCE1} %if 0%{?suse_version} >= 1330 patch -p1 < %{PATCH2} +mv %{buildroot}%/var/adm/fillup-templates \ + %{buildroot}%/usr/share/fillup-templates %endif %if %dm_fallbacks tar xf %{SOURCE3} diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index e3870e3..edd7ea3 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49ba8e70cce08a27a2f09d4a1848870deb1933fa7af46f1b680110bbd437aa92 -size 23523 +oid sha256:d20ee252195873d8eac795edb4d69d2ed6751bfb9c5892fd13ae34542ed2a5f4 +size 23572 From e36fa5f31cfea9180eca1c055f45e657b3d5b08a397c34789bbe150373fc4391 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 23 Nov 2017 20:55:32 +0000 Subject: [PATCH 5/6] fixed typo ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=157 --- xdm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xdm.spec b/xdm.spec index c833220..6e9420f 100644 --- a/xdm.spec +++ b/xdm.spec @@ -147,8 +147,8 @@ pushd %{buildroot} tar xf %{SOURCE1} %if 0%{?suse_version} >= 1330 patch -p1 < %{PATCH2} -mv %{buildroot}%/var/adm/fillup-templates \ - %{buildroot}%/usr/share/fillup-templates +mv %{buildroot}/var/adm/fillup-templates \ + %{buildroot}/usr/share/fillup-templates %endif %if %dm_fallbacks tar xf %{SOURCE3} From dd45e916991175c1a309e4d8bf3447c39add7c9d13991d38b4a861cee963112e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 24 Nov 2017 12:47:52 +0000 Subject: [PATCH 6/6] move /var/adm/fillup-templates/sysconfig.displaymanager to %_fillupdir on TW and sle15/Leap 15 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=158 --- xdm.changes | 2 +- xdm.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xdm.changes b/xdm.changes index 39bd6d1..a0fe03c 100644 --- a/xdm.changes +++ b/xdm.changes @@ -2,7 +2,7 @@ Thu Nov 23 20:20:50 UTC 2017 - sndirsch@suse.com - move /var/adm/fillup-templates/sysconfig.displaymanager - to /usr/share/fillup-templates on TW and sle15/Leap 15 + to %_fillupdir on TW and sle15/Leap 15 ------------------------------------------------------------------- Thu Nov 23 13:52:48 UTC 2017 - rbrown@suse.com diff --git a/xdm.spec b/xdm.spec index 6e9420f..52b49fd 100644 --- a/xdm.spec +++ b/xdm.spec @@ -147,9 +147,13 @@ pushd %{buildroot} tar xf %{SOURCE1} %if 0%{?suse_version} >= 1330 patch -p1 < %{PATCH2} -mv %{buildroot}/var/adm/fillup-templates \ - %{buildroot}/usr/share/fillup-templates %endif +%if "%{_fillupdir}" != "/var/adm/fillup-templates" + mkdir -p %{buildroot}$(dirname %{_fillupdir}) + mv %{buildroot}/var/adm/fillup-templates \ + %{buildroot}$(dirname %{_fillupdir}) +%endif + %if %dm_fallbacks tar xf %{SOURCE3} %endif