--- rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng.spec	2021/02/13 14:20:05	1.4
+++ rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng.spec	2022/11/18 18:46:10	1.14
@@ -4,7 +4,7 @@
 
 Name:		smeserver-phpki-ng
 Version:        0.3
-Release: 	3%{?dist}
+Release: 	9%{?dist}
 Summary:        php integration into SME server
 
 Group:          Applications/System
@@ -17,6 +17,10 @@ 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
+Patch5: 	smeserver-phpki-ng-0.3-bz12228-12198-11873-12229.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}
 BuildArch:      noarch
@@ -28,7 +32,10 @@ Requires:	e-smith-base
 Requires:	phpki-ng
 Requires:	php-process
 Requires: 	e-smith-manager >= 2.6.0-22
-Obsoletes:	smeserver-phpki
+Requires: 	e-smith-apache >= 2.6.0-19
+Requires:       smeserver-php >= 3.0.0-43
+Provides:       smeserver-phpki
+#Obsoletes:	smeserver-phpki
 
 %description
 PHPki is an Open Source Web application for managing a multi-agency PKI for HIPAA compliance.
@@ -38,6 +45,34 @@ This package contains specific configura
 
 
 %changelog
+* Fri Nov 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-10.sme
+- ease migration from smeserver-phpki smeserver-phpki-ng using Provides [SME: 12222]
+- fix ownership on migration (backup/restore) [SME: 12228] 
+- remove /var/service/httpd-pki [SME: 12229] 
+- remove old logrotate [SME: 11873]
+- remove /var/log/phpki and /var/log/httpd-pki [SME: 12198]
+
+* Tue Oct 04 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 0.3-9.sme
+- Fix spec file versioning
+
+* Sat Jul 30 2022 Brian Read <brianr@bjsystems.co.uk> 0.3-8.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
+  reuse phpki user and group
+
 * Sat Feb 13 2021 Brian Read <brianr@bjsystems.co.uk> 0.3-3.sme
 - Set execution bit on /opt/phpki/html/ca in spec file[SME: 11207]
 
@@ -92,16 +127,21 @@ This package contains specific configura
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
-#%patch1 -p1
+%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
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+rm -rf root/var/service/httpd-pki
+rm -rf root/var/log/phpki
 
 %build
 perl createlinks
 
 %install
 
-%{__mkdir_p} $RPM_BUILD_ROOT/var/service/httpd-pki/supervise
-%{__mkdir_p} $RPM_BUILD_ROOT/var/service/httpd-pki/log/supervise
-%{__mkdir_p} $RPM_BUILD_ROOT/var/log/httpd-pki
 %{__mkdir_p} $RPM_BUILD_ROOT/var/lib/php/pki-session
 
 
@@ -111,19 +151,13 @@ chmod +x $RPM_BUILD_ROOT/usr/sbin/system
 
 /bin/rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-	--dir /var/service/httpd-pki 'attr(01755,root,root)' \
-	--file /var/service/httpd-pki/run 'attr(0700,root,root)' \
-        --dir /var/service/httpd-pki/supervise 'attr(0700,root,root)' \
-        --dir /var/service/httpd-pki/log 'attr(0755,root,root)' \
-        --file /var/service/httpd-pki/log/run 'attr(0755,root,root)' \
-        --dir /var/service/httpd-pki/log/supervise 'attr(0700,root,root)' \
-        --dir /var/log/httpd-pki 'attr(0750,smelog,smelog)' \
-        --dir /var/lib/php/pki-session 'attr(0770,root,phpki)' \
+        --dir /var/lib/php/phpki 'attr(0770,root,phpki)' \
+        --dir /var/lib/php/phpki/session 'attr(0770,root,phpki)' \
+        --dir /var/lib/php/phpki/opcache 'attr(0770,root,phpki)' \
+        --dir /var/lib/php/phpki/tmp 'attr(0770,root,phpki)' \
 	> %{name}-%{version}-filelist
 
 %post
-chmod +x /opt/phpki/html/
-chmod +x /opt/phpki/html/ca
 
 %clean
 rm -rf $RPM_BUILD_ROOT