--- rpms/smeserver-support/sme8/smeserver-support.spec 2013/10/12 00:36:35 1.41 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2015/05/15 15:41:26 1.47 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.40 2012/01/24 12:02:37 snetram Exp $ +# $Id: smeserver-support.spec,v 1.46 2014/02/18 18:19:49 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 22 +%define release 28 # 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,19 +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 +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 @@ -273,6 +267,24 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* 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] + +* Tue Feb 18 2014 Ian Wells 2.2.0-26.sme +- Remove old images and roll new tarball [SME: 8213] + +* Sun Nov 3 2013 Ian Wells 2.2.0-25.sme +- Update footer copyright [SME: 7970] + +* 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] @@ -943,12 +955,6 @@ SME Server module to display support and %prep %setup -%patch0 -p1 -%patch1 -p1 -%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