--- rpms/smeserver-dhcpmanager/contribs10/smeserver-dhcpmanager.spec	2024/01/16 12:41:01	1.9
+++ rpms/smeserver-dhcpmanager/contribs10/smeserver-dhcpmanager.spec	2024/03/01 12:18:01	1.12
@@ -1,6 +1,6 @@
 %define name smeserver-dhcpmanager
 %define version 2.0.4
-%define release 15
+%define release 17
 
 Summary: provide a dhcp panel in the server-manager for The SME Server
 Name: %{name}
@@ -32,21 +32,33 @@ Patch8: smeserver-dhcpmanager-2.0.4-loca
 Patch9: smeserver-dhcpmanager-2.0.4-Add-panels-for-SM2.patch
 Patch10: smeserver-dhcpmanager-2.0.4-More-changes-for-sm2-panels.patch
 Patch11: smeserver-dhcpmanager-2.0.4-Yet-more-changes-for-SM2-panels.patch
+Patch12: smeserver-dhcpmanager-2.0.4-Fix-JS-Error-on-load-and-typo-in-table-class-name.patch
+Patch13: smeserver-dhcpmanager-2.0.4-Alter-menu-category-for-new-arrangement.patch
 
 %description
 Implementation of some feature arround dhcp clients like : wol, cleaning dhcpd.leases, Scan of your network etc//
 
 %changelog
+* Fri Mar 01 2024 Brian Read <brianr@koozali.org> 2.0.4-17.sme
+- Edit Menu entry to conform to new arrangements [SME: 12493]
+
+
+* Wed Feb 07 2024 Brian Read <brianr@koozali.org> 2.0.4-16.sme
+- Fix JS error on load and typo in table class name [SME: 12468]
+
 
 * Sat Dec 30 2023 Brian Read <brianr@koozali.org> 2.0.4-15.sme
-- And more fixes for SM2 panels [SME: ]
+- Add more fixes for SM2 panels [SME:11850]
+- Add in Network scan page
 
 * Tue Dec 19 2023 Brian Read <brianr@koozali.org> 2.0.4-14.sme
-- More fixes for SM2 panels [SME: ]
+- More fixes for SM2 panels [SME:11850]
 - Remove Winpopup facility (no longer supported by Windose)
+- Show Leases page
 
 * Tue Jan 18 2022 Brian Read <brianr@bjsystems.co.uk> 2.0.4-13.sme
 - Add panels for SM2 [SME: 11850]
+- Initial panel with DHCP parameters
 
 * Sun Aug 22 2021 Terry Fage <terry.fage@gmail.com> 2.0.4-12.sme
 - apply locale 2021-08-22 patch
@@ -142,6 +154,8 @@ Implementation of some feature arround d
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 rm -rf root/etc/e-smith/templates-custom
 
@@ -164,10 +178,9 @@ rm -rf %{name}-%{version}
 %preun
 
 %post
-if [ -f /usr/share/smanager/lib/SrvMngr.pm ]
-then
-	rm -f /usr/share/smanager/lib/I18N/Modules/Dhcpd/en.pm
-	/usr/sbin/e-smith/signal-event smanager-refresh
+if (systemctl list-unit-files |grep smanager) then
+  echo "Smanager restart in spec file"
+  /sbin/e-smith/signal-event smanager-refresh;
 fi
 true