--- rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2020/11/29 19:04:34	1.3
+++ rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2020/12/22 13:51:37	1.8
@@ -1,4 +1,4 @@
-# $Id: smeserver-phpmyadmin.spec,v 1.2 2020/04/13 11:28:16 jpp Exp $
+# $Id: smeserver-phpmyadmin.spec,v 1.7 2020/12/18 15:44:29 jcrisp 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 5
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,22 +17,35 @@ BuildRoot: /var/tmp/%{name}-%{version}-%
 BuildArchitectures: noarch
 Requires: e-smith-base
 Requires: phpMyAdmin >= 4.4.15.10
-Requires: e-smith-release >= 9.0
+Requires: e-smith-release >= 10.0
 Obsoletes: phpmyadmin,phpMyAdmin3
 BuildRequires: e-smith-devtools
 Obsoletes: e-smith-phpmyadmin
 Obsoletes: smeserver-phpmyadmin <= 3.5.2.2-1
 Obsoletes: smeserver-phpmyadmin-multiuser
 
-Patch0: smeserver-phpmyadmin-4.0.10.2-Update-httpd-for-php-fpw-and-add-unit-file.patch 
- 
+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
+
 %description
 Implementation of phpMyAdmin for SME Server.
 Access with admin username/password via: https://yourdomain/phpmyadmin.
 
 %changelog
+* 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
+
+* Thu Dec 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.10.2-7.sme
+- fix BlowfishSecret [SME: 11043]
+- Update minimum e-smith release version
+
+* Wed Dec 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.10.2-6.sme
+- fix patch file typo [SME: 11043]
+
 * Sun Nov 29 2020 Brian Read <brianr@bjsystems.co.uk> 4.0.10.2-5.sme
-- Change httpd frament to php-fpw and add in .unit.ini to set php vars  [SME: 11043]
+- Change httpd frament to php-fpw and add in .user.ini to set php vars  [SME: 11043]
 
 * Mon Apr 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 4.0.10.2-4.sme
 - first import for contribs10
@@ -119,6 +132,8 @@ Access with admin username/password via:
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__mkdir_p} root/var/lib/phpMyAdmin/tmp
@@ -131,6 +146,7 @@ rm -f %{name}-%{version}-filelist
 /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)' \
     $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 echo "%doc CHANGELOG.git" >> %{name}-%{version}-filelist
 echo "%doc phpmyadmin.sql" >> %{name}-%{version}-filelist