--- rpms/smeserver-support/sme8/smeserver-support.spec	2013/10/12 02:24:51	1.42
+++ rpms/smeserver-support/sme8/smeserver-support.spec	2015/09/25 16:49:41	1.50
@@ -1,10 +1,10 @@
-# $Id: smeserver-support.spec,v 1.41 2013/10/12 00:36:35 wellsi Exp $
+# $Id: smeserver-support.spec,v 1.49 2015/09/04 20:03:34 stephdl Exp $
 
 Summary: SME Server module to display support and licensing information
 %define name smeserver-support
 Name: %{name}
 %define version 2.2.0
-%define release 23
+%define release 30
 
 # 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
@@ -12,20 +12,13 @@ Name: %{name}
 
 # TODO: check mkinitrd,mdadm to see if needed
 %define centos_excludes initscripts,libgsf
-%define centos_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm
+%define centos_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl
 
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 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
+Source: smeserver-support-2.2.0.26.tar.gz
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.7.5
 BuildArchitectures: noarch
@@ -34,6 +27,8 @@ Conflicts: ServiceLink-support
 Obsoletes: e-smith-blades
 Obsoletes: e-smith-keys
 Obsoletes: e-smith-support
+Patch0: smeserver-support-2.2.0.bz8972.motd_donation_message.patch
+Patch1: smeserver-support-2.2.0.bz8972.redhat-release-template.patch
 AutoReqProv: no
 
 # remove old kernels that prevent upgrades
@@ -274,6 +269,30 @@ Conflicts: dungog-mailblocking
 Obsoletes: rkhunter <= 1.3.4-7.el5.sme
 
 %changelog
+* Fri Sep 25 2015 stephane de labrusse <stephdl@de-labrusse.fr> 2.2.0-30.sme
+- created a template for /etc/redhat-release [SME: 8972]
+- added smeserver-support-2.2.0.bz8972.redhat-release-template.patch
+
+* Fri Jul 3 2015 stephane de labrusse <stephdl@de-labrusse.fr> 2.2.0-29.sme
+- enabled the motd message [SME: 8972]
+- Code done by John Crisp <jcrisp@safeandsoundit.co.uk> and
+- Stefano Zamboni <zamboni@mind-at-work.it>
+
+* Fri May 15 2015 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-28.sme
+- Switch back to upstream openssl build [SME: 8925]
+
+* Tue Feb 18 2014 Ian Wells <esmith@wellsi.com> 2.2.0-27.sme
+- Exclude openssl from upstream updates [SME: 8208]
+
+* Tue Feb 18 2014 Ian Wells <esmith@wellsi.com> 2.2.0-26.sme
+- Remove old images and roll new tarball [SME: 8213]
+
+* 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]
 
@@ -949,11 +968,6 @@ SME Server module to display support and
 %setup
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -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