--- rpms/smeserver-support/sme9/smeserver-support.spec	2013/03/11 23:28:04	1.16
+++ rpms/smeserver-support/sme9/smeserver-support.spec	2014/09/10 13:43:23	1.25
@@ -1,18 +1,18 @@
-# $Id: smeserver-support.spec,v 1.15 2013/03/11 23:02:54 slords Exp $
+# $Id: smeserver-support.spec,v 1.24 2014/03/24 03:36:10 wellsi Exp $
 
 Summary: SME Server module to display support and licensing information
 %define name smeserver-support
 Name: %{name}
-%define version 2.4.0
-%define release 14
+%define version 2.6.0
+%define release 2
 
-# These packages come from CentOS, but wee need to use care when
+# 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_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm
+%define centos_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl
 
 Version: %{version}
 Release: %{release}%{?dist}
@@ -21,6 +21,7 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Source1: smeserver_logo.jpg
 Source2: smeserver_logo.gif
+Source3: btn_donateCC_LG.gif
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.7.5
 BuildArchitectures: noarch
@@ -57,7 +58,7 @@ Obsoletes: pythonabi
 Obsoletes: centos-release-notes <= 5.9
 Obsoletes: gettext <= 0.17
 Obsoletes: hmaccalc <= 0.9.6
-Obsoletes: libgomp <= 4.4.7
+Obsoletes: libgomp <= 4.4.7-1.el5
 Obsoletes: libvolume_id <= 095
 Obsoletes: libxml2-python <= 2.6.26
 Obsoletes: dosfstools <= 2.11
@@ -289,6 +290,34 @@ Conflicts: dungog-mailblocking
 Obsoletes: rkhunter <= 1.3.4-7.el5.sme
 
 %changelog
+* Wed Sep 10 2014 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-2.sme
+- Remove openssl from the Exclude list of centos repo [SME: 8530]
+
+* Sun Mar 23 2014 Ian Wells <esmith@wellsi.com> 2.6.0-1.sme
+- Roll new stream to remove obsolete images [SME: 7962] 
+
+* Sun Mar 16 2014 Ian Wells <esmith@wellsi.com> 2.4.0-21.sme
+- Move support.pl from e-smith-base to smeserver-support [SME: 8264]
+- This console license page now uses dialog's textbox.
+
+* Sat Nov 2 2013 Ian Wells <esmith@wellsi.com> 2.4.0-20.sme
+- Update footer copyright [SME: 7961]
+
+* Sat Nov 2 2013 Ian Wells <esmith@wellsi.com> 2.4.0-19.sme
+- Renew full copyright text, by Greg Zartman [SME: 7942]
+
+* Fri Oct 11 2013 Ian Wells <esmith@wellsi.com> 2.4.0-18.sme
+- Renew donation text, by John Crisp [SME: 7896]
+
+* Fri Oct 11 2013 Ian Wells <esmith@wellsi.com> 2.4.0-17.sme
+- Add donation graphic, by John Crisp [SME: 7897]
+
+* Sun May 05 2013 Ian Wells <esmith@wellsi.com> 2.4.0-16.sme
+- Fix /etc/system-release [SME: 7476]
+
+* Sat Mar 16 2013 Shad L. Lords <slords@mail.com> 2.4.0-15.sme
+- Fix libgomp obsoletes to not obsolete el6 version [SME: 7481]
+
 * Mon Mar 11 2013 Shad L. Lords <slords@mail.com> 2.4.0-14.sme
 - Hopefully last set of el5 obsoletes [SME: 7273]
 
@@ -1000,6 +1029,7 @@ SME Server module to display support and
 %setup
 cp %{SOURCE1} root/etc/e-smith/web/common
 cp %{SOURCE2} root/etc/e-smith/web/common
+cp %{SOURCE3} root/etc/e-smith/web/common
 
 %build
 perl createlinks