--- rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2020/12/18 15:44:29	1.7
+++ rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2022/08/01 03:25:07	1.17
@@ -1,4 +1,4 @@
-# $Id: smeserver-phpmyadmin.spec,v 1.6 2020/12/17 12:53:08 jcrisp Exp $
+# $Id: smeserver-phpmyadmin.spec,v 1.16 2022/07/24 04:12:28 jpp Exp $
 # Authority: darrellmay
 # Name: Darrell May
 
@@ -6,7 +6,7 @@ Summary: phpMyAdmin for SME Server
 %define name smeserver-phpmyadmin
 Name: %{name}
 %define version 4.0.10.2
-%define release 8
+%define release 13
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,6 +18,7 @@ BuildArchitectures: noarch
 Requires: e-smith-base
 Requires: phpMyAdmin >= 4.4.15.10
 Requires: e-smith-release >= 10.0
+Requires: e-smith-apache >= 2.6.0-19
 Obsoletes: phpmyadmin,phpMyAdmin3
 BuildRequires: e-smith-devtools
 Obsoletes: e-smith-phpmyadmin
@@ -27,15 +28,28 @@ Obsoletes: smeserver-phpmyadmin-multiuse
 Patch0: smeserver-phpmyadmin-4.0.10.2-Update-httpd-for-php-fpw-and-add-unit-file.patch
 Patch1: smeserver-phpmyadmin-4.0.10.2-bz11043-add-blowfishsecret.patch
 Patch2: smeserver-phpmyadmin-4.0.10.2-bz11043-configure-php-pool.patch
+Patch3: smeserver-phpmyadmin-4.0.10.2-bz11043.patch
+Patch4: smeserver-phpmyadmin-4.0.10.2-bz11408-httpport.patch
+Patch5: smeserver-phpmyadmin-4.0.10.2-bz12056-httpd24.patch
 
 %description
 Implementation of phpMyAdmin for SME Server.
 Access with admin username/password via: https://yourdomain/phpmyadmin.
 
 %changelog
+* Sun Jul 31 2022 Jean-Philippe Pialasse <tests@pialasse.com> 4.0.10.2-13.sme
+- update to httpd 2.4 access syntax [SME: 12056]
+
+* Sat Jul 23 2022 Jean-Philippe Pialasse <tests@pialasse.com> 4.0.10.2-12.sme
+- use $httpPort in place of hardcoded port 80 [SME: 11408]
+- update to httpd 2.4 access syntax [SME: 12056]
+
+* Sun Feb 28 2021 Jean-Philipe Pialasse <tests@pialasse.com> 4.0.10.2-11.sme
+- finish php74 pool integration [SME: 11043]
+  fixed dir perms
+
 * Fri Dec 18 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.10.2-8.sme
 - add php pool template and remove disable unit.ini
-- Fix version to PHP73 - any higher needs a newer version of phpMyAdmin
 
 * Thu Dec 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.10.2-7.sme
 - fix BlowfishSecret [SME: 11043]
@@ -134,9 +148,13 @@ Access with admin username/password via:
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
-%{__mkdir_p} root/var/lib/phpMyAdmin/tmp
+%{__mkdir_p} root/var/lib/php/phpmyadmin/{tmp,session,opcache,wsdlcache}
+%{__mkdir_p} root/var/log/php/phpmyadmin
 perl createlinks
 
 %install
@@ -145,8 +163,12 @@ rm -f %{name}-%{version}-filelist
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
 /bin/rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist  \
-    --dir /var/lib/phpMyAdmin/tmp 'attr(0770,root,www)' \
-    --dir /var/log/php/phpmyadmin  'attr(0755,www,www)' \
+    --dir /var/lib/php/phpmyadmin/ 'attr(0755,root,www)' \
+    --dir /var/lib/php/phpmyadmin/tmp 'attr(0770,www,www)' \
+    --dir /var/lib/php/phpmyadmin/opcache 'attr(0770,www,www)' \
+    --dir /var/lib/php/phpmyadmin/session 'attr(0770,www,www)' \
+    --dir /var/lib/php/phpmyadmin/wsdlcache 'attr(0770,www,www)' \
+    --dir /var/log/php/phpmyadmin  'attr(0770,root,www)' \
     $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 echo "%doc CHANGELOG.git" >> %{name}-%{version}-filelist
 echo "%doc phpmyadmin.sql" >> %{name}-%{version}-filelist