--- rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2020/12/23 12:02:57	1.9
+++ rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2022/07/24 03:59:04	1.15
@@ -1,4 +1,4 @@
-# $Id: smeserver-phpmyadmin.spec,v 1.8 2020/12/22 13:51:37 jcrisp Exp $
+# $Id: smeserver-phpmyadmin.spec,v 1.14 2021/02/28 14:18:21 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 9
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -27,18 +27,23 @@ 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
 
 %description
 Implementation of phpMyAdmin for SME Server.
 Access with admin username/password via: https://yourdomain/phpmyadmin.
 
 %changelog
-* Wed Dec 23 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.10.2-9.sme
-- Bump the the version to fix the tags and apply last patch
+* 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]
 
-* Tue Dec 22 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.10.2-8.sme
-- add php pool template, disable unit.ini, restore httpauth [SME: 11043]
-- Fix version to PHP73 - any higher needs a newer version of phpMyAdmin
+* 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
 
 * Thu Dec 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.10.2-7.sme
 - fix BlowfishSecret [SME: 11043]
@@ -137,9 +142,12 @@ Access with admin username/password via:
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -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
@@ -148,8 +156,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