From e839e06bcf37522b5b22c471c766dba61d8be14982434d2bbac7bb53d713d2b3 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Mon, 7 Dec 2020 12:26:22 +0000 Subject: [PATCH] Accepting request 853102 from home:lnussel:branches:Base:System - useradd_or_adduser_dep must be PreReq so ordering makes sure it gets installed before. - suggest shadow where useradd_or_adduser_dep is actually required OBS-URL: https://build.opensuse.org/request/show/853102 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysuser-tools?expand=0&rev=32 --- macros.sysusers | 3 +-- sysuser-tools.changes | 7 +++++++ sysuser-tools.spec | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/macros.sysusers b/macros.sysusers index 12c3e86..d96156c 100644 --- a/macros.sysusers +++ b/macros.sysusers @@ -13,8 +13,7 @@ # ### -%sysusers_requires Requires(pre): sysuser-shadow \ -Suggests: shadow +%sysusers_requires Requires(pre): sysuser-shadow %sysusers_generate_pre() \ %{_prefix}/lib/rpm/sysusers-generate-pre "%1" > "%2".pre diff --git a/sysuser-tools.changes b/sysuser-tools.changes index 65c1050..fa98239 100644 --- a/sysuser-tools.changes +++ b/sysuser-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 4 10:54:00 UTC 2020 - Ludwig Nussel + +- useradd_or_adduser_dep must be PreReq so ordering makes sure it gets + installed before. +- suggest shadow where useradd_or_adduser_dep is actually required + ------------------------------------------------------------------- Fri Sep 18 10:32:53 UTC 2020 - Fabian Vogt diff --git a/sysuser-tools.spec b/sysuser-tools.spec index e77250c..0914189 100644 --- a/sysuser-tools.spec +++ b/sysuser-tools.spec @@ -38,7 +38,9 @@ Generate auto provides for system users. %package -n sysuser-shadow Summary: Tool to execute sysusers.d with shadow utilities Group: System/Packages -Requires: useradd_or_adduser_dep +PreReq: useradd_or_adduser_dep +# prefer original shadow over busybox by default +Suggests: shadow %description -n sysuser-shadow This package contians a tool, which expects as input a sysusers.d