--- rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng.spec	2022/11/18 19:25:17	1.15
+++ rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng.spec	2022/12/14 21:53:40	1.22
@@ -4,7 +4,7 @@
 
 Name:		smeserver-phpki-ng
 Version:        0.3
-Release: 	11%{?dist}
+Release: 	18%{?dist}
 Summary:        php integration into SME server
 
 Group:          Applications/System
@@ -22,6 +22,8 @@ Patch3: 	smeserver-phpki-ng-0.3-bz12021-
 Patch4: 	smeserver-phpki-ng-0.3-bz12054-httpd24.patch
 Patch5: 	smeserver-phpki-ng-0.3-bz12228-12198-11873-12229.patch
 Patch6: 	smeserver-phpki-ng-0.3-bz11438-takey.patch
+Patch7: 	smeserver-phpki-ng-0.3-httpd-typos.patch
+Patch8: 	smeserver-phpki-ng-0.3-bz12268-bz12266-bz11440-bz11439.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}
 BuildArch:      noarch
@@ -31,11 +33,11 @@ BuildRequires:	e-smith-devtools
 Requires:	mod_auth_tkt
 Requires:	openvpn
 Requires:	e-smith-base
-Requires:	phpki-ng
+Requires:	phpki-ng >= 0.84-14
 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
+Requires:       smeserver-php >= 3.0.0-44
 Provides:       smeserver-phpki
 #Obsoletes:	smeserver-phpki
 
@@ -47,6 +49,22 @@ This package contains specific configura
 
 
 %changelog
+* Wed Dec 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-18.sme
+- revert log/phpki [SME: 12266]
+- phpki-ng autopopulate base info from ldap [SME: 11440]
+- ensure user are seen by php-pool [SME: 12268]
+- safe remote access for crl [SME: 11439]
+- 17-18: applying patches
+
+* Tue Dec 13 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-15.sme
+- fix  typo preventing httpd-pki to start 2
+
+* Sun Nov 20 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-14.sme
+- fix  typo preventing httpd-pki to start 
+
+* Fri Nov 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-13.sme
+- add some more needed bins which cat and egrep [SME: 11438]
+
 * Fri Nov 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-11.sme
 - fix missing takey [SME: 11438]
 
@@ -140,8 +158,9 @@ mkdir -p root/var/log/phpki
 %patch4 -p1
 %patch5 -p1
 rm -rf root/var/service/httpd-pki
-rm -rf root/var/log/phpki
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 perl createlinks
@@ -161,6 +180,7 @@ chmod +x $RPM_BUILD_ROOT/usr/sbin/system
         --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)' \
+        --dir /var/log/phpki 'attr(0770,phpki,phpki)' \
 	> %{name}-%{version}-filelist
 
 %post