--- rpms/smeserver-support/sme8/smeserver-support.spec	2010/07/13 18:09:10	1.37
+++ rpms/smeserver-support/sme8/smeserver-support.spec	2013/11/03 17:32:40	1.44
@@ -1,10 +1,10 @@
-# $Id: smeserver-support.spec,v 1.36 2010/06/29 14:47:51 charliebrady Exp $
+# $Id: smeserver-support.spec,v 1.43 2013/11/03 16:49:09 wellsi Exp $
 
 Summary: SME Server module to display support and licensing information
 %define name smeserver-support
 Name: %{name}
 %define version 2.2.0
-%define release 18
+%define release 25
 
 # These packages come from CentOS, but wee need to use care when
 # updating them - either we've patched them, or we need to do something
@@ -21,8 +21,13 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Source1: smeserver_logo.jpg
 Source2: smeserver_logo.gif
+Source3: btn_donateCC_LG.gif
 Patch0: smeserver-support.bug5656.patch
 Patch1: smeserver-support-2.2.0-migrate_excludes.patch
+Patch2: smeserver-support-2.2.0-obsolete-php5-ibay-property.patch
+Patch3: smeserver-support-2.2.0-donation.patch
+Patch4: smeserver-support-2.2.0-FullCopyrightText.patch
+Patch5: smeserver-support-2.2.0-FooterCopyright.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.7.5
 BuildArchitectures: noarch
@@ -202,6 +207,9 @@ Obsoletes: php5-cgi-pear
 Conflicts: php5-cgi-pear
 Obsoletes: php5-cgi-xmlrpc
 Conflicts: php5-cgi-xmlrpc
+Obsoletes: smeserver-php5-cgi
+
+Obsoletes: php-mcrypt
 
 # This block used to be in the SMEServer RPM. Many are probably 
 # redundant or should be elsewhere or removed
@@ -268,6 +276,27 @@ Conflicts: dungog-mailblocking
 Obsoletes: rkhunter <= 1.3.4-7.el5.sme
 
 %changelog
+* Sun Nov 3 2013 Ian Wells <esmith@wellsi.com> 2.2.0-25.sme
+- Update footer copyright [SME: 7970]
+
+* Sun Nov 3 2013 Ian Wells <esmith@wellsi.com> 2.2.0-24.sme
+- Renew full copyright text, by Greg Zartman [SME: 7941]
+
+* Fri Oct 11 2013 Ian Wells <esmith@wellsi.com> 2.2.0-23.sme
+- Renew donation text, by John Crisp [SME: 7880]
+
+* Fri Oct 11 2013 Ian Wells <esmith@wellsi.com> 2.2.0-22.sme
+- Add donation graphic, by John Crisp [SME: 7879]
+
+* Tue Jan 24 2012 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-21.sme
+- Obsolete smeserver-php5-cgi [SME: 6652]
+
+* Thu Jan 19 2012 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-20.sme
+- Obsolete php-mcrypt [SME: 6814]
+
+* Wed Sep 28 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-19.sme
+- Remove php5 property for ibays [SME: 6652]
+
 * Tue Jul 13 2010 Shad L. Lords <slords@mail.com> - 2.2.0-18.sme
 - Add support for Chinese (Taiwan) (zh_TW). [SME: 6106]
 
@@ -928,8 +957,13 @@ SME Server module to display support and
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -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
 
 %build
 perl createlinks