--- rpms/smeserver-isoqlog/contribs10/smeserver-isoqlog.spec	2022/07/29 05:38:25	1.2
+++ rpms/smeserver-isoqlog/contribs10/smeserver-isoqlog.spec	2022/07/29 06:24:27	1.4
@@ -13,6 +13,8 @@ Patch1: smeserver-isoqlog-2.2.1-patch1.p
 Patch2: smeserver-isoqlog-2.2.1-domcreate.patch
 Patch3: smeserver-isoqlog-2.2.1.bz10509.updatetktauth.patch
 Patch4: smeserver-isoqlog-2.2.1-bz12010-backup.patch
+Patch5: smeserver-isoqlog-2.2.1-bz12049-24syntax.patch
+Patch6: smeserver-isoqlog-2.2.1-systemd.patch
 
 Packager: Peter Schubert <psc@@s-a-c-o.de>
 BuildRoot: /var/tmp/%{name}-%{version}-buildroot
@@ -26,6 +28,10 @@ AutoReqProv: no
 %changelog
 * Fri Jul 29 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.2.1-5.sme
 - add to core backup [SME: 12010]
+- use httpd 2.4 access syntax [SME: 12049]
+- systemd enabled [SME: 11061]
+- update event [SME: 11061]
+- update httpd.conf needed modules [SME: 11061]
 
 * Wed Feb 07 2018 Jean-Philipe Pialasse <tests@pialasse.com> 2.2.1-4.sme
 - new tkt options [SME: 1509]
@@ -66,6 +72,10 @@ Installs Isoqlog on SME Server.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+rm -rf root/service
+rm -rf /root/var/service
 
 %build
 perl createlinks
@@ -77,22 +87,12 @@ rm -rf $RPM_BUILD_ROOT
 #/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 #echo "%doc COPYING"          >> %{name}-%{version}-filelist
 
-%{__mkdir_p} $RPM_BUILD_ROOT/var/service/httpd-isoqlog/supervise
-%{__mkdir_p} $RPM_BUILD_ROOT/var/service/httpd-isoqlog/log/supervise
-%{__mkdir_p} $RPM_BUILD_ROOT/var/log/httpd-isoqlog
 %{__mkdir_p} $RPM_BUILD_ROOT/var/lib/php/isoqlog-session
 
 
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
 /bin/rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-        --dir /var/service/httpd-isoqlog 'attr(01755,root,root)' \
-        --file /var/service/httpd-isoqlog/run 'attr(0700,root,root)' \
-        --dir /var/service/httpd-isoqlog/supervise 'attr(0700,root,root)' \
-        --dir /var/service/httpd-isoqlog/log 'attr(0755,root,root)' \
-        --file /var/service/httpd-isoqlog/log/run 'attr(0755,root,root)' \
-        --dir /var/service/httpd-isoqlog/log/supervise 'attr(0700,root,root)' \
-        --dir /var/log/httpd-isoqlog 'attr(0750,smelog,smelog)' \
         --dir /var/lib/php/isoqlog-session 'attr(0770,root,isoqlog)' \
         > %{name}-%{version}-filelist
 
@@ -113,12 +113,10 @@ fi
 true
 
 %post
-/sbin/e-smith/signal-event isoqlog-conf
 /usr/bin/isoqlog -f /etc/isoqlog.conf 1>/dev/null 2>/dev/null
 
 %postun
 rm -f /etc/httpd/conf.d/isoqlog.conf
-/etc/rc.d/init.d/httpd-e-smith restart
 
 
 %files -f %{name}-%{version}-filelist