--- rpms/e-smith-base/sme10/e-smith-base.spec 2021/01/06 19:21:12 1.86 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2021/01/08 22:13:39 1.87 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.85 2020/12/25 21:30:22 jpp Exp $ +# $Id: e-smith-base.spec,v 1.86 2021/01/06 19:21:12 jpp Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 72 +%define release 73 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -64,6 +64,7 @@ Patch50: e-smith-base-5.8.0-bz9642-init- Patch51: e-smith-base-5.8.0-rewrite_manageraid.patch Patch52: e-smith-base-5.8.0-bz11247-wants.patch Patch53: e-smith-base-5.8.0-bz11309-pwauth-fix.patch +Patch54: e-smith-base-5.8.0 e-smith-base-5.8.0-bz10958-bz11246.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: pwauth @@ -118,6 +119,10 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Fri Jan 08 2021 Jean-Philipe Pialasse 5.8.0-73.sme +- only run isolate if sme-server.target is not active [SME: 11246] +- update system-preset usr/lib file [SME: 10958] + * Wed Jan 06 2021 Jean-Philipe Pialasse 5.8.0-72.sme - fix loss of httpd basic auth [SME: 11309] @@ -2151,6 +2156,7 @@ rm -rf root/etc/rc.d/init.d/local mkdir -p root/usr/lib/systemd/system/sme-server.target.d %patch52 -p1 %patch53 -p1 +%patch54 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \