--- rpms/smeserver-support/sme9/smeserver-support.spec	2013/03/16 15:24:29	1.17
+++ rpms/smeserver-support/sme9/smeserver-support.spec	2014/03/17 00:46:58	1.23
@@ -1,12 +1,12 @@
-# $Id: smeserver-support.spec,v 1.16 2013/03/11 23:28:04 slords Exp $
+# $Id: smeserver-support.spec,v 1.22 2013/11/03 17:39:19 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 15
+%define release 21
 
-# 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
 
@@ -21,6 +21,12 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Source1: smeserver_logo.jpg
 Source2: smeserver_logo.gif
+Source3: btn_donateCC_LG.gif
+Patch1: smeserver-support-2.4.0-SystemRelease.patch
+Patch2: smeserver-support-2.4.0-donation.patch
+Patch3: smeserver-support-2.4.0-FullCopyrightText.patch
+Patch4: smeserver-support-2.4.0-FooterCopyright.patch
+Patch5: smeserver-support-2.4.0-consoleSupport.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.7.5
 BuildArchitectures: noarch
@@ -289,6 +295,25 @@ Conflicts: dungog-mailblocking
 Obsoletes: rkhunter <= 1.3.4-7.el5.sme
 
 %changelog
+* 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]
 
@@ -1003,6 +1028,12 @@ 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
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks