--- rpms/smeserver-support/sme9/smeserver-support.spec 2013/10/12 03:09:35 1.20 +++ rpms/smeserver-support/sme9/smeserver-support.spec 2014/03/24 03:36:10 1.24 @@ -1,12 +1,12 @@ -# $Id: smeserver-support.spec,v 1.19 2013/10/12 03:01:13 wellsi Exp $ +# $Id: smeserver-support.spec,v 1.23 2014/03/17 00:46:58 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 18 +%define version 2.6.0 +%define release 1 -# 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 @@ -22,8 +22,6 @@ 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -292,6 +290,19 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* Sun Mar 23 2014 Ian Wells 2.6.0-1.sme +- Roll new stream to remove obsolete images [SME: 7962] + +* Sun Mar 16 2014 Ian Wells 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 2.4.0-20.sme +- Update footer copyright [SME: 7961] + +* Sat Nov 2 2013 Ian Wells 2.4.0-19.sme +- Renew full copyright text, by Greg Zartman [SME: 7942] + * Fri Oct 11 2013 Ian Wells 2.4.0-18.sme - Renew donation text, by John Crisp [SME: 7896] @@ -1016,8 +1027,6 @@ SME Server module to display support and 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 %build perl createlinks