--- rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng.spec	2021/02/25 06:47:25	1.6
+++ rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng.spec	2022/07/30 18:02:56	1.12
@@ -4,7 +4,7 @@
 
 Name:		smeserver-phpki-ng
 Version:        0.3
-Release: 	4%{?dist}
+Release: 	6%{?dist}
 Summary:        php integration into SME server
 
 Group:          Applications/System
@@ -18,6 +18,8 @@ Source:         %{name}-%{version}.tar.x
 Patch0:         smeserver-phpki-ng-0.3-Add-extra-Loadmodules-to-httpd-conf.patch
 Patch1:         smeserver-phpki-ng-0.3-Add-in-systemd-startup.patch
 Patch2: 	smeserver-phpki-ng-0.3-php73pool.patch
+Patch3: 	smeserver-phpki-ng-0.3-bz12021-backup.patch
+Patch4: 	smeserver-phpki-ng-0.3-bz12054-httpd24.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}
 BuildArch:      noarch
@@ -29,6 +31,8 @@ Requires:	e-smith-base
 Requires:	phpki-ng
 Requires:	php-process
 Requires: 	e-smith-manager >= 2.6.0-22
+Requires: 	e-smith-apache >= 2.6.0-19
+Requires:       smeserver-php >= 3.0.0-43
 Obsoletes:	smeserver-phpki
 
 %description
@@ -39,6 +43,19 @@ This package contains specific configura
 
 
 %changelog
+* Sat Jul 30 2022 Brian Read <brianr@bjsystems.co.uk> 0.3-7.sme
+- Re-build and link to latest devtools [SME: 11997]
+
+* Thu Jul 21 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-7.sme
+- add to core backup [SME: 12021]
+- httpd 2.4 access syntax [SME: 12054]
+
+* Thu Aug 05 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.3-6.sme
+- remove modules from patch file [SME: 11402]
+
+* Sun Mar 07 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.3-5.sme
+- modify dirs in spec file
+
 * Thu Feb 25 2021 Jean-Philipe Pialasse <tests@pialasse.com> 0.3-4.sme
 - configure php73 pool [SME: 11207]
   tidy httpd.conf file
@@ -98,10 +115,12 @@ This package contains specific configura
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
-mkdir -p root/var/lib/php/phppki/{tmp,session,opcache}
+%patch2 -p1
+mkdir -p root/var/lib/php/phpki/{tmp,session,opcache}
 rm -rf root/var/lib/php/pki-session
 mkdir -p root/var/log/phpki
-%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks