--- rpms/smeserver-support/sme8/smeserver-support.spec 2012/01/19 20:13:08 1.39 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2013/10/12 00:36:35 1.41 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.38 2011/09/28 17:02:40 snetram Exp $ +# $Id: smeserver-support.spec,v 1.40 2012/01/24 12:02:37 snetram Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.2.0 -%define release 20 +%define release 22 # 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,6 +21,7 @@ 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 @@ -203,6 +204,7 @@ Obsoletes: php5-cgi-pear Conflicts: php5-cgi-pear Obsoletes: php5-cgi-xmlrpc Conflicts: php5-cgi-xmlrpc +Obsoletes: smeserver-php5-cgi Obsoletes: php-mcrypt @@ -271,6 +273,12 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* Fri Oct 11 2013 Ian Wells 2.2.0-22.sme +- Add donation graphic, by John Crisp [SME: 7879] + +* Tue Jan 24 2012 Jonathan Martens 2.2.0-21.sme +- Obsolete smeserver-php5-cgi [SME: 6652] + * Thu Jan 19 2012 Jonathan Martens 2.2.0-20.sme - Obsolete php-mcrypt [SME: 6814] @@ -940,6 +948,7 @@ SME Server module to display support and %patch2 -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