--- rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/03/30 02:16:21	1.2
+++ rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/04/16 11:39:00	1.3
@@ -1,18 +1,20 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.1 2016/02/05 23:28:48 stephdl Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.2 2016/03/30 02:16:21 unnilennium Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.6.0
-%define release 2
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: smeserver-qpsmtpd-2.6.0-PERMS.patch
+Patch1: smeserver-qpsmtpd-2.6.0-compat_with_0.96.patch
+Patch2: smeserver-qpsmtpd-2.6.0-remove_obsolete_badrcptto_pattern_conf.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-Requires: qpsmtpd >= 0.83
+Requires: qpsmtpd >= 0.96
 Requires: perl(Mail::DKIM)
 Requires: perl(Mail::DKIM::DkSignature)
 Requires: daemontools
@@ -42,6 +44,9 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Sat Apr 16 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-3.sme
+- Adapt for qpsmtpd-0.96 (mainly plugin renamed) [SME: 9460]
+
 * Tue Mar 29 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
 - fix warning on spool_dir perms  [SME: 9408]
 - smeserver-qpsmtpd-2.6.0-PERMS.patch
@@ -732,7 +737,8 @@ SME Server qpsmtpd smtpd module
 %prep
 %setup
 %patch0 -p1
-
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks
@@ -742,9 +748,9 @@ mkdir -p $PEERS_CONFIG/0
 mkdir -p $PEERS_CONFIG/local
 
 DISABLE_LOCAL="
-10check_earlytalker
+10earlytalker
 12count_unrecognized_commands
-16require_resolvable_fromhost
+16resolvable_fromhost
 20rhsbl
 22dnsbl
 70spamassassin