--- rpms/smeserver-support/sme10/smeserver-support.spec	2017/09/26 02:20:38	1.18
+++ rpms/smeserver-support/sme10/smeserver-support.spec	2020/05/22 03:52:54	1.21
@@ -1,17 +1,17 @@
-# $Id: smeserver-support.spec,v 1.17 2017/03/21 03:47:39 unnilennium Exp $
+# $Id: smeserver-support.spec,v 1.20 2018/05/02 17:58:16 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 13
+%define release 16
 
 # 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_excludes initscripts,libgsf,samba*,libsmbclient,libwbclient,libtevent,python-tevent
 %define centos_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl
 
 Version: %{version}
@@ -25,12 +25,16 @@ Patch2: smeserver-support-2.8.0.os-relea
 Patch3: smeserver-support-2.8.0-koozali.patch
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.7.5
 BuildArchitectures: noarch
 Provides: server-manager-images
 AutoReqProv: no
 
+# SME 10 requires these explicitly
+Requires: perl(LWP::Protocol::https)
+
 # New features that we want to pull in on upgrades
 Requires: screen
 Requires: smeserver-yum
@@ -44,7 +48,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
@@ -100,6 +104,15 @@ Requires: psacct
 Requires: dmraid
 
 %changelog
+* 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]
+
 * Mon Sep 25 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-13.sme
 - upstream samba packages were not all excluded [SME: 10428]
 
@@ -918,6 +931,7 @@ SME Server module to display support and
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks