--- rpms/e-smith-email/sme10/e-smith-email.spec	2016/02/04 23:55:01	1.1
+++ rpms/e-smith-email/sme10/e-smith-email.spec	2016/04/22 21:26:31	1.2
@@ -1,15 +1,16 @@
-# $Id: e-smith-email.spec,v 1.14 2015/02/06 07:13:39 stephdl Exp $
+# $Id: e-smith-email.spec,v 1.1 2016/02/04 23:55:01 vip-ire Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.6.0
-%define release 1
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
+Patch0: e-smith-email-5.6.0-smtpd_to_qpsmtpd.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -35,6 +36,9 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Fri Apr 22 2016 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-2.sme
+- Merge smtpd entry into qpsmtpd, same for ssmtpd into sqpsmtpd [SME: 9478]
+
 * Fri Feb 5 2016 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-1.sme
 - Roll new stream for sme10
 
@@ -1417,6 +1421,7 @@ e-smith server and gateway software - em
 
 %prep
 %setup
+%patch0 -p1
 
 %build
 perl createlinks