From b6f400e587e28792df5281fcfd8c6b324db1616bd59e7cf3e6f8dcf47cff5411 Mon Sep 17 00:00:00 2001
From: Peter Varkoly <varkoly@suse.com>
Date: Mon, 20 Feb 2017 10:00:51 +0000
Subject: [PATCH] Accepting request 458874 from home:kukuk:branches:server:mail

- Fix requires:
  - shadow is needed for postfix-mysql pre-install section
  - insserv is not needed if systemd is used

OBS-URL: https://build.opensuse.org/request/show/458874
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=252
---
 postfix.changes | 7 +++++++
 postfix.spec    | 9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/postfix.changes b/postfix.changes
index 17af5ed..8a8692a 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Feb 18 14:01:35 UTC 2017 - kukuk@suse.com
+
+- Fix requires:
+  - shadow is needed for postfix-mysql pre-install section
+  - insserv is not needed if systemd is used
+
 -------------------------------------------------------------------
 Sat Jan 21 23:27:34 UTC 2017 - chris@computersalat.de
 
diff --git a/postfix.spec b/postfix.spec
index 159a9ae..86a8f3e 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -94,7 +94,6 @@ BuildRequires:  pkgconfig
 BuildRequires:  postgresql-devel
 Requires:       iproute2
 Requires(pre):  permissions
-Requires(pre):  %insserv_prereq
 Requires(pre):  %fillup_prereq
 Provides:       smtp_daemon
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -110,7 +109,7 @@ BuildRequires:  fdupes
 BuildRequires:  systemd
 %{?systemd_requires}
 %else
-Requires(pre):  %insserv_prereq %fillup_prereq
+Requires(pre):  %insserv_prereq
 Requires(pre):  %{_bindir}/getent
 Requires(pre):  pwdutils
 Requires(pre):  /bin/awk
@@ -149,6 +148,7 @@ This package contains the documentation for %{name}
 Summary:        Postfix plugin to support MySQL maps
 Group:          Productivity/Networking/Email/Servers
 Requires(pre): %{name} = %{version}
+Requires(pre): shadow
 
 %description mysql
 Postfix plugin to support MySQL maps. This library will be loaded by
@@ -517,10 +517,11 @@ fi
 # ---------------------------------------------------------------------------
 
 %postun
-%restart_on_update %{name}
-%insserv_cleanup
 %if 0%{?suse_version} > 1210
 %service_del_postun %{name}.service
+%else
+%restart_on_update %{name}
+%insserv_cleanup
 %endif
 /sbin/ldconfig