--- rpms/smeserver-support/sme10/smeserver-support.spec	2018/02/11 04:52:58	1.19
+++ rpms/smeserver-support/sme10/smeserver-support.spec	2021/01/08 18:58:31	1.23
@@ -1,18 +1,18 @@
-# $Id: smeserver-support.spec,v 1.18 2017/09/26 02:20:38 unnilennium Exp $
+# $Id: smeserver-support.spec,v 1.22 2020/11/26 19:04:14 jpp Exp $
 
 Summary: SME Server module to display support and licensing information
 %define name smeserver-support
 Name: %{name}
 %define version 2.8.0
-%define release 14
+%define release 18
 
 # These packages come from CentOS, but we need to use care when
 # updating them - either we've patched them, or we need to do something
 # prior to taking the update
 
 # TODO: check mkinitrd,mdadm to see if needed
-%define centos_excludes initscripts,libgsf,samba*,libsmbclient,libwbclient
-%define centos_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl
+%define centos_excludes initscripts,libgsf
+%define centos_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl,samba,samba-client,samba-client-libs,samba-common,samba-common-libs,samba-common-tools,samba-libs,samba*,libsmbclient,libwbclient,libtevent,python-tevent
 
 Version: %{version}
 Release: %{release}%{?dist}
@@ -26,6 +26,8 @@ Patch3: smeserver-support-2.8.0-koozali.
 Patch4: smeserver-support-2.8.0-koozali_manager.patch
 Patch5: smeserver-support-2.8.0-bz9676hover.patch
 Patch6: smeserver-support-2.8.0-bz10516.patch
+Patch7: smeserver-support-2.8.0-bz11167-update.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.7.5
 BuildArchitectures: noarch
@@ -48,7 +50,7 @@ Requires: e-smith-domains
 Requires: e-smith-ibays
 Requires: e-smith-nutUPS
 Requires: e-smith-portforwarding
-Requires: e-smith-starterwebsite
+Obsoletes: e-smith-starterwebsite
 
 # 5.x used bind for name resolution - we need to pull in djbdns
 Requires: e-smith-dnscache
@@ -104,6 +106,18 @@ Requires: psacct
 Requires: dmraid
 
 %changelog
+* Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-18.sme
+- add update event [SME: 11167]
+
+* Thu Nov 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-17.sme
+- revert update of samba using upstream CentOS repo [SME: 11196]
+
+* Thu May 21 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-16.sme
+- obsoletes e-smith-starterwebsite [SME: 8903]
+
+* Wed May 02 2018 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-15.sme
+- exclude libtevent,python-tevent from base and updates to avoid conflict with localy build version of samba [SME: 10573]
+
 * Sat Feb 10 2018 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-14.sme
 - add back perl(LWP::Protocol::https) support  [SME: 10516]
 
@@ -926,6 +940,7 @@ SME Server module to display support and
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 perl createlinks