--- rpms/e-smith-qmail/sme10/e-smith-qmail.spec	2016/02/05 21:46:43	1.1
+++ rpms/e-smith-qmail/sme10/e-smith-qmail.spec	2016/04/22 21:29:37	1.2
@@ -1,15 +1,16 @@
-# $Id: e-smith-qmail.spec,v 1.6 2013/07/05 23:46:49 wellsi Exp $
+# $Id: e-smith-qmail.spec,v 1.1 2016/02/05 21:46:43 stephdl Exp $
 
 Summary: startup scripts for Dan Bernstein's qmail package
 %define name e-smith-qmail
 Name: %{name}
 %define version 2.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-qmail-2.6.0-smtpd_to_qpsmtpd.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.13.0-04
 BuildArchitectures: noarch
@@ -26,6 +27,9 @@ Obsoletes: qmail-workaround
 AutoReqProv: no
 
 %changelog
+* Fri Apr 22 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-2.sme
+- Merge smtpd entry into qpsmtpd, same for ssmtpd into sqpsmtpd [SME: 9478]
+
 * Fri Feb 05 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme
 - Initial release to sme10
 
@@ -342,6 +346,7 @@ Startup scripts for Dan Bernstein's qmai
 
 %prep
 %setup
+%patch0 -p1
 
 %build
 perl createlinks