--- rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2021/02/28 07:07:04	1.11
+++ rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2023/10/25 19:47:08	1.18
@@ -1,4 +1,4 @@
-# $Id: smeserver-phpmyadmin.spec,v 1.10 2021/02/28 03:30:17 jpp Exp $
+# $Id: smeserver-phpmyadmin.spec,v 1.17 2022/08/01 03:25:07 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 14
 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
@@ -28,14 +29,28 @@ Patch0: smeserver-phpmyadmin-4.0.10.2-Up
 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
+Patch6: smeserver-phpmyadmin-4.0.10.2-bz12343-private.patch
 
 %description
 Implementation of phpMyAdmin for SME Server.
 Access with admin username/password via: https://yourdomain/phpmyadmin.
 
 %changelog
-* Sun Feb 28 2021 Jean-Philipe Pialasse <tests@pialasse.com> 4.0.10.2-9.sme
+* Wed Oct 25 2023 Jean-Philippe Pialasse <tests@pialasse.com> 4.0.10.2-14.sme
+- fix private access not respected for admin [SME: 12343]
+
+* 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
@@ -138,6 +153,9 @@ Access with admin username/password via:
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %{__mkdir_p} root/var/lib/php/phpmyadmin/{tmp,session,opcache,wsdlcache}
@@ -150,12 +168,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/php/phmyadmin/ 'attr(0755,root,www)' \
-    --dir /var/lib/php/phmyadmin/tmp 'attr(0770,www,www)' \
-    --dir /var/lib/php/phmyadmin/opcache 'attr(0770,www,www)' \
-    --dir /var/lib/php/phmyadmin/session 'attr(0770,www,www)' \
-    --dir /var/lib/php/phmyadmin/wsdlcache 'attr(0770,www,www)' \
-    --dir /var/log/php/phpmyadmin  'attr(0755,root,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