From 9813b05f8c35b651ff9fa5cbd6e6fd31f28ea6b93ca338701dac4be16d063ee1 Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Tue, 6 Jul 2021 22:01:06 +0000
Subject: [PATCH] Accepting request 902429 from home:gmbr3:Active

- Add now working CONFIG parameter to sysusers generator
- Remove unnecessary group line from postfix-vmail-user.conf

OBS-URL: https://build.opensuse.org/request/show/902429
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=417
---
 postfix-bdb.changes     | 6 ++++++
 postfix-bdb.spec        | 7 +++----
 postfix-user.conf       | 2 +-
 postfix-vmail-user.conf | 1 -
 postfix.changes         | 1 +
 postfix.spec            | 6 ++++--
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/postfix-bdb.changes b/postfix-bdb.changes
index 126e3e3..57a9507 100644
--- a/postfix-bdb.changes
+++ b/postfix-bdb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 18 17:11:05 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Add now working CONFIG parameter to sysusers generator
+- Remove unnecessary group line from postfix-vmail-user.conf
+
 -------------------------------------------------------------------
 Mon Jun 14 15:46:54 UTC 2021 - Michael Ströder <michael@stroeder.com>
 
diff --git a/postfix-bdb.spec b/postfix-bdb.spec
index fbc0fda..03b2f23 100644
--- a/postfix-bdb.spec
+++ b/postfix-bdb.spec
@@ -117,8 +117,7 @@ BuildRequires:  libnsl-devel
 %endif
 %if 0%{?suse_version} >= 1330
 BuildRequires:  sysuser-tools
-Requires:       system-user-nobody
-Requires:       group(%{mail_group})
+Requires(pre):  user(nobody)
 Requires(pre):  group(%{mail_group})
 %sysusers_requires
 %else
@@ -222,8 +221,8 @@ make makefiles pie=yes shared=yes dynamicmaps=yes \
 make %{?_smp_mflags}
 %if 0%{?suse_version} >= 1330
 # Create postfix user
-%sysusers_generate_pre %{SOURCE12} postfix
-%sysusers_generate_pre %{SOURCE13} vmail
+%sysusers_generate_pre %{SOURCE12} postfix postfix-user.conf
+%sysusers_generate_pre %{SOURCE13} vmail postfix-vmail-user.conf
 %endif
 # ---------------------------------------------------------------------------
 
diff --git a/postfix-user.conf b/postfix-user.conf
index de7a24a..39fb493 100644
--- a/postfix-user.conf
+++ b/postfix-user.conf
@@ -1,6 +1,6 @@
 # Type Name ID GECOS [HOME]
-g maildrop 59 - -
 g postfix 51 - -
+g maildrop 59 - -
 u postfix 51 "Postfix Daemon" /var/spool/postfix
 m postfix maildrop
 m postfix mail
diff --git a/postfix-vmail-user.conf b/postfix-vmail-user.conf
index ca63704..c59549d 100644
--- a/postfix-vmail-user.conf
+++ b/postfix-vmail-user.conf
@@ -1,3 +1,2 @@
 # Type Name ID GECOS [HOME]
-g vmail - - -
 u vmail - "Virtual Mail User" /srv/maildirs
diff --git a/postfix.changes b/postfix.changes
index a4037c8..8575485 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -16,6 +16,7 @@ Wed Jun 23 22:28:52 UTC 2021 - Christian Wittmer <chris@computersalat.de>
 Fri Jun 18 17:11:05 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 
 - Add now working CONFIG parameter to sysusers generator
+- Remove unnecessary group line from postfix-vmail-user.conf
 
 -------------------------------------------------------------------
 Mon Jun 14 15:46:54 UTC 2021 - Michael Ströder <michael@stroeder.com>
diff --git a/postfix.spec b/postfix.spec
index 927007a..2f99967 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -103,8 +103,7 @@ Provides:       smtp_daemon
 BuildRequires:  libnsl-devel
 %endif
 BuildRequires:  sysuser-tools
-Requires:       system-user-nobody
-Requires:       group(%{mail_group})
+Requires(pre):  user(nobody)
 Requires(pre):  group(%{mail_group})
 %sysusers_requires
 
@@ -132,6 +131,9 @@ This package contains the documentation for %{name}
 Summary:        Postfix plugin to support MySQL maps
 Group:          Productivity/Networking/Email/Servers
 Requires(pre):  %{name} = %{version}
+%if 0%{?suse_version} < 1550
+Provides:       group(vmail)
+%endif
 %sysusers_requires
 
 %description mysql