--- rpms/smeserver-dhcpmanager/contribs10/smeserver-dhcpmanager.spec	2020/10/12 14:42:04	1.1
+++ rpms/smeserver-dhcpmanager/contribs10/smeserver-dhcpmanager.spec	2021/03/31 02:32:09	1.5
@@ -1,6 +1,6 @@
 %define name smeserver-dhcpmanager
 %define version 2.0.4
-%define release 8
+%define release 11
 
 Summary: provide a dhcp panel in the server-manager for The SME Server
 Name: %{name}
@@ -15,6 +15,7 @@ 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
@@ -24,11 +25,27 @@ Patch2: smeserver-dhcpmanager-2.0.4.uniq
 Patch3: smeserver-dhcpmanager-2.0.4-locale-2017-02-02.patch
 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
 
 %description
 Implementation of some feature arround dhcp clients like : wol, cleaning dhcpd.leases, Scan of your network etc//
 
 %changelog
+* 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]
+
+* Wed Mar 24 2021 BogusDateBot
+- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
+  by assuming the date is correct and changing the weekday.
+
+* Mon Oct 12 2020 Brian Read <brianr@bjsystems.co.uk> 2.0.4-9.sme
+- Import to SME10 tree - [SME: 11029 ]
+
 * Sat Dec 02 2017 SME Translation Server <translations@contribs.org> 2.0.4-8.sme
 - apply locale 2017-12-02 patch
 
@@ -36,7 +53,7 @@ Implementation of some feature arround d
 - apply locale 2017-03-25 patch
 
 * Mon Mar 13 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.0.4-6.sme
-- fix issue with last patch deleting pt-br file  [SME: 10150]
+- Add Update event to createlinks issue with last patch deleting pt-br file  [SME: 10150]
 
 * Wed Feb 01 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.0.4-5.sme
 - apply locale 2017-02-02.patch
@@ -92,8 +109,6 @@ Implementation of some feature arround d
 * Thu Dec 23 2004 Thierry Quaak <thierry@quaak.net>
 - Last release of e-smith-dhcpmanager-1.5-1, thanks a lot for his work
 
-
-
 %prep
 %setup
 %patch0 -p1
@@ -102,6 +117,9 @@ Implementation of some feature arround d
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+rm -rf root/etc/e-smith/templates-custom
 
 %build
 perl createlinks
@@ -119,16 +137,12 @@ cd ..
 rm -rf %{name}-%{version}
 
 %pre
+
 %preun
 
 %post
-#/etc/e-smith/events/actions/navigation-conf
-
-
-
 
 %postun
-#rm /etc/e-smith/templates-custom/etc/dhcpd.conf/25NetbiosNameServers
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)