From a14e5a99e9bfc235e1734ddec89f3bb3e20f54d9e0d309cebb50802272103f8a Mon Sep 17 00:00:00 2001
From: Peter Varkoly <varkoly@suse.com>
Date: Wed, 18 Nov 2020 10:15:29 +0000
Subject: [PATCH] Accepting request 846304 from home:kukuk:container

- dovecot is already creating the user accounts, no need to duplicate
  the code as this package does not need them.
- Don't hard require systemd

OBS-URL: https://build.opensuse.org/request/show/846304
OBS-URL: https://build.opensuse.org/package/show/server:mail/dovecot23?expand=0&rev=83
---
 dovecot23.changes |  7 +++++++
 dovecot23.spec    | 17 ++++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/dovecot23.changes b/dovecot23.changes
index bcfe65b..a551509 100644
--- a/dovecot23.changes
+++ b/dovecot23.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov  4 15:29:48 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
+
+- dovecot is already creating the user accounts, no need to duplicate
+  the code as this package does not need them.
+- Don't hard require systemd
+
 -------------------------------------------------------------------
 Tue Sep 15 10:26:44 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
 
diff --git a/dovecot23.spec b/dovecot23.spec
index c7555d7..bffa7de 100644
--- a/dovecot23.spec
+++ b/dovecot23.spec
@@ -114,10 +114,10 @@ BuildRequires:  libexttextcat-devel
 %endif
 %if %{with systemd}
 BuildRequires:  pkgconfig(systemd)
-%{?systemd_requires}
+%{?systemd_ordering}
 %define has_systemd 1
 %endif
-PreReq:         shadow %fillup_prereq
+PreReq:         %fillup_prereq
 # bump requires on noarch package to the version which copies the files from /usr/share/dovecot/
 Requires:       dovecot >= 2.3
 Conflicts:      otherproviders(dovecot-implementation)
@@ -461,16 +461,8 @@ rm %{buildroot}%{_unitdir}/dovecot.{service,socket}
 rm %{buildroot}%{_sysconfdir}/%{pkg_name}/README
 
 %pre
-test -n "$FIRST_ARG" || FIRST_ARG=$1
-getent group %{pkg_name} >/dev/null || /usr/sbin/groupadd -r %{pkg_name}
-getent passwd %{pkg_name} >/dev/null || \
-	/usr/sbin/useradd -g %{pkg_name} -s /bin/false -r \
-	-c "User for Dovecot imapd" -d %{_var}/run/%{pkg_name} %{pkg_name}
-getent passwd dovenull >/dev/null || \
-	/usr/sbin/useradd -g %{pkg_name} -s /bin/false -r \
-	-c "User for Dovecot login" -d %{_var}/run/%{pkg_name} dovenull
 # do not let dovecot run during upgrade rhbz#134325
-if [ "$FIRST_ARG" -ge "1" ]; then
+if [ "$1" -ge "1" ]; then
   rm -f %restart_flag
   %if %{with systemd}
     # we get installed before the unversioned dovecot package is installed
@@ -496,10 +488,9 @@ fi
 %post -p /sbin/ldconfig
 
 %postun
-test -n "$FIRST_ARG" || FIRST_ARG=$1
 /sbin/ldconfig
 # do not let dovecot run during upgrade rhbz#134325
-if [ "$FIRST_ARG" -ge "1" -a -e %restart_flag ]; then
+if [ "$1" -ge "1" -a -e %restart_flag ]; then
   %if %{with systemd}
     # we get installed before the unversioned dovecot package is installed
     # in that case we dont need to restart as there was no file to start us before