--- rpms/smeserver-support/sme10/smeserver-support.spec	2016/06/16 03:09:51	1.11
+++ rpms/smeserver-support/sme10/smeserver-support.spec	2018/05/02 17:58:16	1.20
@@ -1,17 +1,17 @@
-# $Id: smeserver-support.spec,v 1.10 2016/06/16 03:04:53 unnilennium Exp $
+# $Id: smeserver-support.spec,v 1.19 2018/02/11 04:52:58 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 8
+%define release 15
 
 # 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
+%define centos_excludes initscripts,libgsf,samba*,libsmbclient,libwbclient,libtevent,python-tevent
 %define centos_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl
 
 Version: %{version}
@@ -19,19 +19,22 @@ Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
-Source1: smeserver_logo.jpg
-Source2: smeserver_logo.gif
-Source3: btn_donateCC_LG.gif
 Patch0: smeserver-support-2.8.0-update_copyright_2016.patch
 Patch1: smeserver-support-2.8.0-remove_smolt_service.patch
 Patch2: smeserver-support-2.8.0.os-release.patch
 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
@@ -101,6 +104,29 @@ Requires: psacct
 Requires: dmraid
 
 %changelog
+* 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]
+
+* Mon Mar 20 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-12.sme
+- exclude samba from centos repo as we have our own with DC support [SME: 10155]
+
+* Fri Mar 03 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-11.sme
+- improving link to donation [SME: 9598]
+
+* Tue Jul 19 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-10.sme
+- fix hover color [SME: 9676]
+
+* Tue Jul 19 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-9.sme
+- Koozali branding of manager [SME: 9676]
+- new images in archive; removed old images from cvs
+- updated some css smeserver-support-2.8.0-koozali_manager.patch
+
 * Wed Jun 15 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-8.sme
 - reverting partly the changes in last patch [SME: 9598]
 - wrong catch of proxy related url with the http to https changes
@@ -900,9 +926,9 @@ SME Server module to display support and
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-cp %{SOURCE1} root/etc/e-smith/web/common
-cp %{SOURCE2} root/etc/e-smith/web/common
-cp %{SOURCE3} root/etc/e-smith/web/common
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
@@ -929,8 +955,6 @@ rm -f %{name}-%{version}-%{release}-file
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ -f /boot/grub/splash.xpm.gz ] || ln -s tux.xpm.gz /boot/grub/splash.xpm.gz
-/bin/true
 
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)