--- rpms/smeserver-support/sme8/smeserver-support.spec 2012/01/24 12:02:37 1.40 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2013/11/03 16:49:09 1.43 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.39 2012/01/19 20:13:08 snetram Exp $ +# $Id: smeserver-support.spec,v 1.42 2013/10/12 02:24:51 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 21 +%define release 24 # 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,9 +21,12 @@ 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -272,6 +275,15 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* Sun Nov 3 2013 Ian Wells 2.2.0-24.sme +- Renew full copyright text, by Greg Zartman [SME: 7941] + +* Fri Oct 11 2013 Ian Wells 2.2.0-23.sme +- Renew donation text, by John Crisp [SME: 7880] + +* 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] @@ -942,8 +954,11 @@ SME Server module to display support and %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -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