--- rpms/e-smith-manager/sme10/e-smith-manager.spec 2020/12/11 04:05:59 1.36 +++ rpms/e-smith-manager/sme10/e-smith-manager.spec 2021/03/16 20:08:44 1.37 @@ -1,10 +1,10 @@ -# $Id: e-smith-manager.spec,v 1.35 2020/12/11 04:00:40 jpp Exp $ +# $Id: e-smith-manager.spec,v 1.36 2020/12/11 04:05:59 jpp Exp $ Summary: e-smith manager navigation module %define name e-smith-manager Name: %{name} %define version 2.8.0 -%define release 32 +%define release 33 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -27,6 +27,7 @@ Patch13: e-smith-manager-2.8.0-bz9591-ic Patch14: e-smith-manager-2.8.0-bz9677_password_followsymlinks.patch Patch15: e-smith-manager-2.8.0-bz10967-remove-hardcoded-ports.patch Patch16: e-smith-manager-2.8.0-bz11144-bz11110-systemd-update.patch +Patch17: e-smith-manager-2.8.0-bz10448-bugreport.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools @@ -40,6 +41,9 @@ Provides: server-manager AutoReqProv: no %changelog +* Tue Mar 16 2021 Jean-Philippe Pialasse 2.8.0-33.sme +- fix wrong system mode reported in bugreport [SME: 10448] + * Thu Dec 10 2020 Jean-Philipe Pialasse 2.8.0-32.sme - create -update event [SME: 11144] - migrate httpd-admin to systemd [SME: 11110] @@ -791,6 +795,7 @@ This RPM contributes the navigation bars %patch15 -p1 %patch16 -p1 rm -rf root/var/service +%patch17 -p1 %build perl createlinks @@ -861,6 +866,10 @@ find /etc/e-smith/web/panels/manager/cgi xargs grep -l Persisten | \ xargs rm -f +if [ -d /var/service/httpd-admin ] ; then + rm -rf /var/service/httpd-admin +fi + %postun %files -f %{name}-%{version}-%{release}-filelist