--- rpms/e-smith-nutUPS/sme10/e-smith-nutUPS.spec	2020/11/18 22:12:51	1.4
+++ rpms/e-smith-nutUPS/sme10/e-smith-nutUPS.spec	2021/03/27 02:12:12	1.13
@@ -1,16 +1,18 @@
-# $Id: e-smith-nutUPS.spec,v 1.3 2016/02/05 22:31:56 stephdl Exp $
+# $Id: e-smith-nutUPS.spec,v 1.12 2021/03/25 01:19:15 terryfage Exp $
 
 Summary: SME server - nut UPS interaction module
 %define name e-smith-nutUPS
 Name: %{name}
 %define version 2.6.0
-%define release 3
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-nutUPS-2.6.0-bz9423-bz11146.patch
+Patch1: e-smith-nutUPS-2.6.0-bz11488.patch
+Patch2: e-smith-nutUPS-2.6.0-bz11494.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: nut nut-client daemontools
@@ -25,7 +27,19 @@ A module which configures the Network UP
 the SME server software.
 
 %changelog
-* Wed Nov 18 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
+* Sat Mar 27 2021 Terry Fage <tfage@yahoo.com.au> 2.6.0-10.sme
+- fix ExecStartPre path for /usr/lib/tmpfiles.d/nut-run.conf [SME: 11488]
+
+* Thu Mar 25 2021 Terry Fage <tfage@yahoo.com.au> 2.6.0-9.sme
+- fix ExecStartPre path for nut.service [SME: 11488]
+
+* Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+- fix template path for monitor [SME: 9423]
+
+* Sun Nov 29 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 2.6.0-6.sme
+- Fix preset line endings in 49-koozali.preset [SME: 11215]
+
+* Wed Nov 18 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-5.sme
 - add update event to avoid reboot [SME: 11146]
 - adapt nut UPS for systemd [SME: 9423]
 
@@ -250,6 +264,9 @@ the SME server software.
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
 rm -rf root/etc/rc.d/init.d/nut root/etc/rc.d/rc7.d/S38nut 
 mkdir -p root/usr/lib/systemd/system/nut-monitor.service.d root/usr/lib/systemd/system/nut-server.service.d