From 08833d1f60b43d173a861ebe264cf236b526267fd5c416c36efe9f272885fbfa Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 26 Feb 2016 12:48:54 +0000 Subject: [PATCH 1/4] - Remove %service_del_postun display-manager.service from %postun macro (boo#968405). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=120 --- xdm.changes | 6 ++++++ xdm.spec | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xdm.changes b/xdm.changes index 7b8086e..fe1c4cf 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 26 12:46:53 UTC 2016 - eich@suse.com + +- Remove %service_del_postun display-manager.service + from %postun macro (boo#968405). + ------------------------------------------------------------------- Wed Feb 17 11:16:30 UTC 2016 - werner@suse.de diff --git a/xdm.spec b/xdm.spec index d1bd103..0ba9d66 100644 --- a/xdm.spec +++ b/xdm.spec @@ -178,10 +178,6 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %postun %if 0%{?suse_version} < 1315 %{insserv_cleanup} -%else -# Do not restart DM on update (bnc#886641) -export DISABLE_RESTART_ON_UPDATE=yes -%service_del_postun display-manager.service %endif %preun From 7c2008468d83f561f3adfd69463abd5809a23a7a97834304b24b822ffafb1e17 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 3 Mar 2016 14:16:19 +0000 Subject: [PATCH 2/4] Accepting request 365433 from home:eeich:branches:X11:XOrg - xdm.tar.bz: * /etc/X11/xdm/sys.xsession: fix regression from fix for boo#967002 (boo#968172). * /etc/X11/xdm/Xsession: + Add comments for documentation + Fix semantics + Don't use $HOME/.xinitrc as session script. Let sys.xession handle this. + Make argument parser more robust: add parse error detection. * Add an 'xsession' desktop file: this should offer a session where the $HOME/.xsession is used (boo#968631). OBS-URL: https://build.opensuse.org/request/show/365433 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=121 --- xdm.changes | 16 ++++++++++++++++ xdm.spec | 2 ++ xdm.tar.bz2 | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/xdm.changes b/xdm.changes index fe1c4cf..35c166b 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat Feb 27 11:53:42 UTC 2016 - eich@suse.com + +- xdm.tar.bz: + * /etc/X11/xdm/sys.xsession: + fix regression from fix for boo#967002 (boo#968172). + * /etc/X11/xdm/Xsession: + + Add comments for documentation + + Fix semantics + + Don't use $HOME/.xinitrc as session script. Let sys.xession + handle this. + + Make argument parser more robust: + add parse error detection. + * Add an 'xsession' desktop file: this should offer a session + where the $HOME/.xsession is used (boo#968631). + ------------------------------------------------------------------- Fri Feb 26 12:46:53 UTC 2016 - eich@suse.com diff --git a/xdm.spec b/xdm.spec index 0ba9d66..ab17b9a 100644 --- a/xdm.spec +++ b/xdm.spec @@ -225,6 +225,8 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %{_libdir}/X11/xdm/ %dir %{_datadir}/X11/app-defaults %{_datadir}/X11/app-defaults/Chooser +%dir %{_datadir}/xsessions +%{_datadir}/xsessions/xsession.desktop %{_mandir}/man1/chooser.1%{?ext_man} %{_mandir}/man1/xdm.1%{?ext_man} %if 0%{?suse_version} < 1315 diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index 5852474..a27674f 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84058c07eba515d89b0b481bf5ab8e41d0322aa7ba89d2ea853596617e95de73 -size 22344 +oid sha256:72b5fe908da6ed78b238d158f344dca8f00e8cdaea8590317bfedb8c23ecfc2b +size 22699 From b27a8613f28338659e7ce4a8045450398a0b1a7bea0ad7c4e922f8f5d4aaf9af Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 3 Mar 2016 15:34:33 +0000 Subject: [PATCH 3/4] - After boo#968405 got fixed in /etc/rpm/macros.systemd, resurrect the old behavior of %postun (boo#968405). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=122 --- xdm.changes | 6 ++++++ xdm.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/xdm.changes b/xdm.changes index 35c166b..8c89b74 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 3 15:31:51 UTC 2016 - eich@suse.com + +- After boo#968405 got fixed in /etc/rpm/macros.systemd, resurrect the old + behavior of %postun (boo#968405). + ------------------------------------------------------------------- Sat Feb 27 11:53:42 UTC 2016 - eich@suse.com diff --git a/xdm.spec b/xdm.spec index ab17b9a..a1bd1c3 100644 --- a/xdm.spec +++ b/xdm.spec @@ -178,6 +178,9 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %postun %if 0%{?suse_version} < 1315 %{insserv_cleanup} +%else +# Do not restart DM on update (bnc#886641) +%service_del_postun -f display-manager.service %endif %preun From 25baf78509ac47a60f48174a56d46291b0e6e4249a98babb2d3a7e30bacc566b Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 3 Mar 2016 16:49:07 +0000 Subject: [PATCH 4/4] - fixed option used. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=123 --- xdm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdm.spec b/xdm.spec index a1bd1c3..dbd5a74 100644 --- a/xdm.spec +++ b/xdm.spec @@ -180,7 +180,7 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %{insserv_cleanup} %else # Do not restart DM on update (bnc#886641) -%service_del_postun -f display-manager.service +%service_del_postun -n display-manager.service %endif %preun