--- rpms/smeserver-support/sme8/smeserver-support.spec 2014/02/18 18:19:49 1.46 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2015/09/25 16:49:41 1.50 @@ -1,18 +1,18 @@ -# $Id: smeserver-support.spec,v 1.45 2014/02/18 17:39:43 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 27 +%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 # prior to taking the update # TODO: check mkinitrd,mdadm to see if needed -%define centos_excludes initscripts,libgsf,openssl -%define centos_remove kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm +%define centos_excludes initscripts,libgsf +%define centos_remove kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl Version: %{version} Release: %{release}%{?dist} @@ -27,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 @@ -267,6 +269,18 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* Fri Sep 25 2015 stephane de labrusse 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 2.2.0-29.sme +- enabled the motd message [SME: 8972] +- Code done by John Crisp and +- Stefano Zamboni + +* Fri May 15 2015 Daniel Berteaud 2.2.0-28.sme +- Switch back to upstream openssl build [SME: 8925] + * Tue Feb 18 2014 Ian Wells 2.2.0-27.sme - Exclude openssl from upstream updates [SME: 8208] @@ -952,6 +966,8 @@ SME Server module to display support and %prep %setup +%patch0 -p1 +%patch1 -p1 %build perl createlinks