--- rpms/smeserver-support/sme10/smeserver-support.spec 2016/04/11 19:04:55 1.5 +++ rpms/smeserver-support/sme10/smeserver-support.spec 2016/06/16 03:04:53 1.10 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.4 2016/03/14 08:37:13 vip-ire Exp $ +# $Id: smeserver-support.spec,v 1.9 2016/06/15 17:36:12 unnilennium Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.8.0 -%define release 4 +%define release 8 # 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 @@ -24,6 +24,8 @@ 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 +Patch2: smeserver-support-2.8.0.os-release.patch +Patch3: smeserver-support-2.8.0-koozali.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -99,6 +101,20 @@ Requires: psacct Requires: dmraid %changelog +* Wed Jun 15 2016 Jean-Philipe Pialasse 2.8.0-8.sme +- reverting partly the changes in last patch [SME: 9598] +- wrong catch of proxy related url with the http to https changes +- thank to Charlie Brady for reporting + +* Wed Jun 15 2016 Jean-Philipe Pialasse 2.8.0-7.sme +- update links to koozali.org [SME: 9598] + +* Tue Jun 14 2016 stephane de Labrusse 2.8.0-6.sme +- Template of os-release [SME: 9580] + +* 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] @@ -865,6 +881,8 @@ 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