--- 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	2020/12/10 14:45:47	1.15
@@ -1,15 +1,23 @@
-# $Id: e-smith-qmail.spec,v 1.6 2013/07/05 23:46:49 wellsi Exp $
+# $Id: e-smith-qmail.spec,v 1.14 2020/12/07 03:53:50 jpp 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 12
 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
+Patch1: e-smith-qmail-2.6.0-exclude_from_group_email.patch
+Patch2: e-smith-qmail-2.6.0-update_all_groups_alias.patch
+Patch3: e-smith-qmail-2.6.0-bz11105-systemd.patch
+Patch4: %{name}-%{version}-rc7_link-rpm_update.patch
+Patch5: e-smith-qmail-2.6.0-bz11105-systemd2.patch
+Patch6: e-smith-qmail-2.6.0-bz11245_runit_required.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.13.0-04
 BuildArchitectures: noarch
@@ -26,6 +34,42 @@ Obsoletes: qmail-workaround
 AutoReqProv: no
 
 %changelog
+* Thu Dec 10 2020  Michel Begue <mab974@gmail.com> 2.6.0-12.sme
+- add Requires=runit.service [SME: 11245]
+
+* Sun Dec 06 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
+- fix missing actions for systemd on upgrade event [SME: 11105]
+  cleanup preset file
+
+* Fri Dec 04 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme
+-  remove qmail link in init.d and whole rc.d [SME: 11105]
+   take 3
+
+* Fri Dec 04 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
+- remove qmail link in init.d [SME: 11105]
+
+* Thu Dec 03 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- execute systemd-reload before service adjust in events [SME: 11228] 
+- remove S95reset-unsavedflag [SME: 11229]
+
+* Thu Nov 19 2020 Michel Begue <mab974@gmail.com> 2.6.0-6.sme
+- remove rc7.d link [SME: 11105]
+- fix actions in e-smith-qmail-update [SME: 11152]
+
+* Sat Nov 14 2020 Michel Begue <mab974@gmail.com> 2.6.0-5.sme
+- Move qmail service to systemd [SME: 11105]
+- Create e-smith-qmail-update event [SME: 11152]
+
+* Thu Jul 20 2017 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-4.sme
+- Update aliases files for every groups passed as argument [SME: 10386]
+
+* Tue May 31 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-3.sme
+- Add possibility to exclude users or members of other groups from group
+  email address [SME: 9523]
+
+* 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 +386,15 @@ Startup scripts for Dan Bernstein's qmai
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+rm -rf root/etc/rc.d
+rm -rf root/usr/lib/systemd/system-preset
 
 %build
 perl createlinks