--- rpms/smeserver-isoqlog/contribs10/smeserver-isoqlog.spec	2020/10/28 16:32:53	1.1
+++ rpms/smeserver-isoqlog/contribs10/smeserver-isoqlog.spec	2022/08/01 02:49:45	1.7
@@ -2,7 +2,7 @@ Summary: Isoqlog on SME
 %define name smeserver-isoqlog
 Name: %{name}
 %define version 2.2.1
-%define release 4
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,16 +12,35 @@ Patch0: %{name}-%{version}-webserver.pat
 Patch1: smeserver-isoqlog-2.2.1-patch1.patch
 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
 BuildArchitectures: noarch
-Requires: e-smith-release => 7.5
+Requires: e-smith-release => 10.0
+Requires: e-smith-apache >= 2.6.0-19
 Requires: isoqlog => 2.2.1
 BuildRequires: e-smith-devtools
 
 AutoReqProv: no
 
 %changelog
+* Sun Jul 31 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.2.1-7.sme
+- use httpd 2.4 access syntax [SME: 12049]
+  add Requires e-smith-apache >= 2.6.0-19
+
+* Sat Jul 30 2022 Brian Read <brianr@bjsystems.co.uk> 2.2.1-6.sme
+- Re-build and link to latest devtools [SME: 11997]
+
+* 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]
 
@@ -29,7 +48,7 @@ AutoReqProv: no
 - added  expand template to events domain-create  [SME: 7713]
 
 * Thu Jun 27 2013 JP Pialasse <test@pialasse.com> 2.2.1-2.sme
-- fix missing domain [SME: 7713]
+- Re-build and link to latest devtools missing domain [SME: 7713]
 - added expand template to events
 - patch1
 
@@ -37,7 +56,7 @@ AutoReqProv: no
 - webserver conf path and file missing fix
 
 * Thu Aug 30 2012 JP Pialasse <test@pialasse.com> 2.2.1-1.2.sme
-- fix BuildRequires
+- Re-build and link to latest devtools BuildRequires
 
 * Thu Aug 16 2012 JP Pialasse <test@pialasse.com> 2.2.1-1-1.sme
 - removing isoqlog files from the rpm
@@ -60,6 +79,11 @@ Installs Isoqlog on SME Server.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+rm -rf root/service
+rm -rf root/var/service
 
 %build
 perl createlinks
@@ -71,22 +95,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
 
@@ -107,12 +121,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