--- rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2020/04/13 11:23:29	1.1
+++ rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec	2020/12/16 12:16:02	1.5
@@ -1,4 +1,4 @@
-# $Id: smeserver-phpmyadmin.spec,v 1.1 2015/08/22 20:16:59 stephdl Exp $
+# $Id: smeserver-phpmyadmin.spec,v 1.4 2020/12/01 07:23:40 brianr 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 3
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -16,7 +16,7 @@ URL: http://www.phpmyadmin.net/
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
-Requires: phpMyAdmin >= 4.0.10.1
+Requires: phpMyAdmin >= 4.4.15.10
 Requires: e-smith-release >= 9.0
 Obsoletes: phpmyadmin,phpMyAdmin3
 BuildRequires: e-smith-devtools
@@ -24,11 +24,22 @@ 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
+
 %description
 Implementation of phpMyAdmin for SME Server.
 Access with admin username/password via: https://yourdomain/phpmyadmin.
 
 %changelog
+* Wed Dec 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.10.2-6.sme
+- fix patch file typo
+
+* 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
+
 * Sat Aug 22 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 4.0.10.2-3.sme
 - Initial release to contribs9
 
@@ -110,6 +121,7 @@ Access with admin username/password via:
 
 %prep
 %setup
+%patch0 -p1
 
 %build
 %{__mkdir_p} root/var/lib/phpMyAdmin/tmp