--- rpms/smeserver-dhcpmanager/contribs10/smeserver-dhcpmanager.spec	2021/03/24 11:20:21	1.3
+++ 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 10
+%define release 17
 
 Summary: provide a dhcp panel in the server-manager for The SME Server
 Name: %{name}
@@ -15,9 +15,11 @@ BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
 Requires: e-smith-release >= 9.0
+Requires: e-smith-base >= 5.8.0-93
 Requires: net-tools
 Requires: nmap >= 2:6.25
 AutoReqProv: no
+
 Patch0: smeserver-dhcpmanager-2.0.4-locale-2015-09-12.patch
 Patch1: smeserver-dhcpmanager-2.0.4-locale-2016-03-09.patch
 Patch2: smeserver-dhcpmanager-2.0.4.uniq_by_mac.patch
@@ -25,11 +27,46 @@ Patch3: smeserver-dhcpmanager-2.0.4-loca
 Patch4: smeserver-dhcpmanager-2.0.4-locale-2017-03-25.patch
 Patch5: smeserver-dhcpmanager-2.0.4-locale-2017-12-02.patch
 Patch6: smeserver-dhcpmanager-2.0.4-Add-Update-event-to-createlinks.patch
+Patch7: smeserver-dhcpmanager-2.0.4-bz11506-noCustomTemplates.patch
+Patch8: smeserver-dhcpmanager-2.0.4-locale-2021-08-22.patch
+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
+- 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: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
+
+* Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.0.4-11.sme
+- removing tmeplate custom, merged with core [SME: 11506]
+- adding third DNS entry [SME: 11506]
+
 * Wed Mar 24 2021 Brian Read <brianr@bjsystems.co.uk> 2.0.4-10.sme
 - Add Update event to createlinks [SME: 11029]
 
@@ -112,11 +149,19 @@ Implementation of some feature arround d
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+
+rm -rf root/etc/e-smith/templates-custom
 
 %build
 perl createlinks
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
@@ -129,16 +174,18 @@ cd ..
 rm -rf %{name}-%{version}
 
 %pre
+
 %preun
 
 %post
-#/etc/e-smith/events/actions/navigation-conf
-
-
+if (systemctl list-unit-files |grep smanager) then
+  echo "Smanager restart in spec file"
+  /sbin/e-smith/signal-event smanager-refresh;
+fi
+true
 
 
 %postun
-#rm /etc/e-smith/templates-custom/etc/dhcpd.conf/25NetbiosNameServers
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)