From e4462d4771d0fdfb4642e1b4412e832ca117d5f769b4221c7ac68a409f04d2ac Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 27 Aug 2020 13:25:57 +0000 Subject: [PATCH] Accepting request 829968 from home:fbui:branches:X11:XOrg - Drop insserv-compat dependency when display-manager.service is used OBS-URL: https://build.opensuse.org/request/show/829968 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=206 --- xdm.changes | 18 ++++++++++++++++++ xdm.spec | 2 ++ xdm.tar.bz2 | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/xdm.changes b/xdm.changes index 78a5c89..f5cf7f3 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Aug 27 11:36:48 UTC 2020 - Franck Bui + +- Drop insserv-compat dependency when display-manager.service is used + + insserv-compat is going to be dropped soon or later on systems with + systemd as init system. + + It was only needed by /usr/lib/X11/display-manager script that uses + rc_status to pretty print the status of a command. + + Since this script is intended to be used by display-manager.service + and not called directly by users and systemd has already its own + mechanism to report status, the use of rc_status doesn't seem to be + useful. + + The exit failure status for each command has been preserved. + ------------------------------------------------------------------- Wed Aug 26 17:23:18 UTC 2020 - Franck Bui diff --git a/xdm.spec b/xdm.spec index a774947..5e3aa88 100644 --- a/xdm.spec +++ b/xdm.spec @@ -75,7 +75,9 @@ Requires: /sbin/pidof %if 0%{?with_systemd} Requires: %fillup_prereq %endif +%if 0%{?suse_version} < 1315 Requires: insserv-compat +%endif Requires: logrotate Requires: sessreg Requires: xconsole diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index 7e78e3e..eb34c1d 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a059ea9c1b06f6724c591928d1f3ca25585d2fa2bbbd138d531029d59dea72 -size 23744 +oid sha256:3490e1140041d9bf6a9bfafc3f6e4ce0faf8ad04dbd53726ee0335f758882681 +size 23798