--- rpms/smeserver-phpmyadmin-multiuser/contribs8/smeserver-phpmyadmin-multiuser.spec	2012/09/03 14:36:57	1.1
+++ rpms/smeserver-phpmyadmin-multiuser/contribs8/smeserver-phpmyadmin-multiuser.spec	2013/05/28 13:26:31	1.2
@@ -1,31 +1,42 @@
-# $Id: smeserver-phpmyadmin-multiuser.spec,v 1.6 2008/11/25 16:20:28 slords Exp $
+# $Id: smeserver-phpmyadmin-multiuser.spec,v 1.1 2012/09/03 14:36:57 slords Exp $
 # Authority: nocvs
 # Name: Michel Van hees
 
 Summary: PhpMyAdmin for SME server
 %define name smeserver-phpmyadmin-multiuser
 Name: %{name}
-%define version 2.11.3
-%define release 3
+%define version 3.5.2.2
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: Freely distributable
 Group: Apache
 Source: %{name}-%{version}.tar.gz
-Patch0: smeserver-phpmyadmin-multiuser-2.11.3-RemoveCreatelinks.patch
-Patch1: smeserver-phpmyadmin-multiuser-2.11.3-RemoveLicense.patch
-Patch2: smeserver-phpmyadmin-multiuser-2.11.3-initDB.patch
-Patch3: smeserver-phpmyadmin-multiuser-2.11.3-Relocate.patch
-Patch4: smeserver-phpmyadmin-multiuser-2.11.3-Alias.patch
+#Patch0: smeserver-phpmyadmin-multiuser-2.11.3-RemoveCreatelinks.patch
+#Patch1: smeserver-phpmyadmin-multiuser-2.11.3-RemoveLicense.patch
+#Patch2: smeserver-phpmyadmin-multiuser-2.11.3-initDB.patch
+#Patch3: smeserver-phpmyadmin-multiuser-2.11.3-Relocate.patch
+#Patch4: smeserver-phpmyadmin-multiuser-2.11.3-Alias.patch
 
 BuildRoot: /var/tmp/e-smith-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
-Requires: smeserver-release >= 7
+Requires: smeserver-release >= 8
 Requires: phpmyadmin
 AutoReqProv: no
 
+Requires: phpMyAdmin3 >= 3.5.2.2
+Obsoletes: phpmyadmin
+Obsoletes: smeserver-phpmyadmin-multiuser <= 3.5.2.2-1
+
 %changelog
+
+* Tue May 28 2013 JP Pialasse <tests@pialasse.com> 3.5.2.2-1.sme
+- adapted for SME8 [SME: 7626, 7628]
+- dependency on phpMyAdmin >=3.5.2.2 
+- changed URL to phpmyadmin-multi to avoid conflicts with non multiuser version [SME: 7628]
+- more secured scheme for private vs public (need public to get public otherwise private) [SME: 5007]
+
 * Sat May 17 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.11.3-3
 - Removed license from doc list as it made build fail
 
@@ -100,12 +111,12 @@ SME server - phpmyadmin multiuser for sm
 
 %prep
 %setup
-rm -rf root/opt
-%patch0 -p1 -E
-%patch1 -p1 -E
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#rm -rf root/opt
+#%patch0 -p1 -E
+#%patch1 -p1 -E
+#%patch2 -p1
+#%patch3 -p1
+#%patch4 -p1
 
 %build