--- rpms/e-smith-manager/sme10/e-smith-manager.spec	2020/12/11 04:00:40	1.35
+++ rpms/e-smith-manager/sme10/e-smith-manager.spec	2022/07/30 01:36:55	1.42
@@ -1,10 +1,10 @@
-# $Id: e-smith-manager.spec,v 1.34 2020/06/27 18:28:04 jpp Exp $
+# $Id: e-smith-manager.spec,v 1.41 2022/07/25 08:48:32 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 37
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -27,6 +27,10 @@ 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
+Patch18: e-smith-manager-2.8.0-bz11872-log.patch
+Patch19: e-smith-manager-2.8.0-bz12129-httpd24.patch
+Patch20: e-smith-manager-2.8.0-bz12129-httpd24-2.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
@@ -36,10 +40,26 @@ Requires: e-smith-lib >= 1.18.0-26
 Requires: mod_auth_tkt
 Requires: pwauth
 Requires: perl(Apache::AuthTkt)
+Requires: e-smith-apache >= 2.6.0-19
 Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* Fri Jul 29 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-37.sme
+- update to httpd 2.4 access syntax for httpd-admin [SME: 12129]
+
+* Mon Jul 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-36.sme
+- update to httpd 2.4 access syntax [SME: 12129]
+
+* Fri Feb 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-35.sme
+- removing reference to old log rotation action [SME: 11872]
+
+* Thu Mar 18 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-34.sme
+- take 2 wrong system mode reported in bugreport [SME: 10448] 
+
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-33.sme
+- fix wrong system mode reported in bugreport [SME: 10448]
+
 * Thu Dec 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-32.sme
 - create -update event [SME: 11144]
 - migrate httpd-admin to systemd [SME: 11110]
@@ -791,6 +811,10 @@ This RPM contributes the navigation bars
 %patch15 -p1
 %patch16 -p1
 rm -rf root/var/service
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 perl createlinks
@@ -818,19 +842,19 @@ mkdir -p root/etc/e-smith/web/panels/pas
 mkdir -p root/etc/httpd/admin-conf
 
 mkdir -p root/service
-mkdir -p root/etc/rc.d/init.d/supervise
-for service in httpd-admin
-do
-  ln -s /var/service/$service root/service/$service
-  mkdir -p root/var/service/$service/supervise
-  touch root/var/service/$service/down
-  if [ -d root/var/service/$service/log ]
-  then
-    mkdir -p root/var/service/$service/log/supervise
-    mkdir -p root/var/log/$service
-  fi
-  ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service
-done
+#mkdir -p root/etc/rc.d/init.d/supervise
+#for service in httpd-admin
+#do
+#  ln -s /var/service/$service root/service/$service
+#  mkdir -p root/var/service/$service/supervise
+#  touch root/var/service/$service/down
+#  if [ -d root/var/service/$service/log ]
+#  then
+#    mkdir -p root/var/service/$service/log/supervise
+#    mkdir -p root/var/log/$service
+#  fi
+#  ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service
+#done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -861,6 +885,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