--- rpms/smeserver-support/sme10/smeserver-support.spec 2016/03/14 08:37:13 1.4 +++ rpms/smeserver-support/sme10/smeserver-support.spec 2016/04/11 19:04:55 1.5 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.3 2016/03/03 11:01:44 vip-ire Exp $ +# $Id: smeserver-support.spec,v 1.4 2016/03/14 08:37:13 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 3 +%define release 4 # 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 @@ -23,6 +23,7 @@ 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 @@ -98,6 +99,9 @@ Requires: psacct Requires: dmraid %changelog +* 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] @@ -860,6 +864,7 @@ 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