--- rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2020/04/13 11:28:16	1.2
+++ rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2020/12/17 12:53:08	1.6
@@ -1,4 +1,4 @@
-# $Id: smeserver-phpmyadmin.spec,v 1.1 2020/04/13 11:23:29 jpp Exp $
+# $Id: smeserver-phpmyadmin.spec,v 1.5 2020/12/16 12:16:02 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 4
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,18 +17,31 @@ 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
+Patch1: smeserver-phpmyadmin-4.0.10.2-bz11043-add-blowfishsecret.patch
+
 %description
 Implementation of phpMyAdmin for SME Server.
 Access with admin username/password via: https://yourdomain/phpmyadmin.
 
 %changelog
+* 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 .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
 
@@ -113,6 +126,8 @@ Access with admin username/password via:
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__mkdir_p} root/var/lib/phpMyAdmin/tmp