--- rpms/smeserver-support/sme10/smeserver-support.spec 2016/02/05 23:22:16 1.1 +++ rpms/smeserver-support/sme10/smeserver-support.spec 2016/05/12 21:21:08 1.6 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.29 2016/01/20 20:44:34 vip-ire Exp $ +# $Id: smeserver-support.spec,v 1.5 2016/04/11 19:04:55 vip-ire Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.8.0 -%define release 1 +%define release 5 # 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 @@ -22,6 +22,8 @@ Source: %{name}-%{version}.tar.xz Source1: smeserver_logo.jpg Source2: smeserver_logo.gif Source3: btn_donateCC_LG.gif +Patch0: smeserver-support-2.8.0-update_copyright_2016.patch +Patch1: smeserver-support-2.8.0-remove_smolt_service.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -29,7 +31,6 @@ Provides: server-manager-images AutoReqProv: no # New features that we want to pull in on upgrades -Requires: smolt Requires: screen Requires: smeserver-yum Requires: smeserver-clamav @@ -98,6 +99,18 @@ Requires: psacct Requires: dmraid %changelog +* Thu May 12 2016 Daniel Berteaud 2.8.0-5.sme +- Rebuild for [SME: 9393] + +* Mon Apr 11 2016 Daniel Berteaud 2.8.0-4.sme +- Remove smolt service link and service entry [SME: 9420] + +* Mon Mar 14 2016 Daniel Berteaud 2.8.0-3.sme +- Don't require smolt anymore [SME: 9287] + +* Thu Mar 3 2016 Daniel Berteaud 2.8.0-2.sme +- Update copyright in server-manager footer [SME: 9269] + * Sat Feb 06 2016 stephane de Labrusse 2.8.0-1.sme - Initial release to sme10 @@ -853,6 +866,8 @@ SME Server module to display support and %prep %setup +%patch0 -p1 +%patch1 -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