--- rpms/smeserver-phpmyadmin/contribs8/smeserver-phpmyadmin.spec	2012/09/03 14:36:53	1.1
+++ rpms/smeserver-phpmyadmin/contribs8/smeserver-phpmyadmin.spec	2013/06/23 00:20:28	1.8
@@ -1,34 +1,50 @@
-# $Id: smeserver-phpmyadmin.spec,v 1.6 2008/11/25 16:20:28 slords Exp $
+# $Id: smeserver-phpmyadmin.spec,v 1.7 2013/06/20 21:37:12 unnilennium Exp $
 # Authority: darrellmay
 # Name: Darrell May
 
 Summary: phpMyAdmin for SME Server 
 %define name smeserver-phpmyadmin
 Name: %{name}
-%define version 2.11.1.2
-%define release 3
+%define version 3.5.2.2
+%define release 6 
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Mitel/addon
 Source: %{name}-%{version}.tar.gz
-Patch0: smeserver-phpmyadmin-2.11.1.2-FixLocation.patch
-Patch1: smeserver-phpmyadmin-2.11.1.2-TemplateExpansionAndServiceRestart.patch
-Patch2: smeserver-phpmyadmin-2.11.1.2-TemplatePermission.patch
+Patch0: smeserver-phpmyadmin-3.5.2.2-configext.patch
+Patch1: smeserver-phpmyadmin-3.5.2.2-patch1.patch
 URL: http://www.phpmyadmin.net/ 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
-Requires: phpmyadmin
+Requires: phpMyAdmin3 >= 3.5.2.2
+Obsoletes: phpmyadmin
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: e-smith-phpmyadmin
-Obsoletes: smeserver-phpmyadmin <= 2.11.1.2-1
+Obsoletes: smeserver-phpmyadmin <= 3.5.2.2-1
+Obsoletes: smeserver-phpmyadmin-multiuser
 
 %description
 Implementation of phpMyAdmin for SME Server.
 Access with admin username/password via: https://yourdomain/phpmyadmin.
 
 %changelog
+* Sat Jun 22 2013 JP Pialasse <tests@pialasse.com> 3.5.2.2-6
+- Obsolete multiuser [SME: 7685]
+
+* Tue Jun 18 2013 JP Pialasse <tests@pialasse.com> 3.5.2.2-5
+- added full 3.5 configuration to avoid errors [SME: 7153] [SME: 7194]
+- incorporated multiuser contrib in this package [SME: 7628 7627 ]
+- increased security [SME: 5007]
+- configext.patch
+- release bump to 4 to fix spec file
+- patch1 to fix config.inc.php syntax error
+
+* Thu Aug 06 2012 JP Pialasse  aka Unnilennium  <tests@pialasse.com> 3.5.2.2-2
+- first version for SME 8
+- adaptation for phpMyAdmin3 3.5.2.2
+
 * Thu May 15 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.11.1.2-3
 - Protect sensible data and prevent access error by setting 
   proper permissions to config.inc.php template [SME: 4343]
@@ -70,7 +86,7 @@ Access with admin username/password via:
 %setup
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 
 %build
 perl createlinks