[phpMyAdmin] Upstream released 3.3.6 (#628301)

[Robert Scheck]

commit 80d624f7fb0147ca3201b1ad041bd54745fc31ae
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Aug 29 14:33:29 2010 +0200

    Upstream released 3.3.6 (#628301)

 .gitignore                    |    2 +-
 phpMyAdmin-3.3.5-mysqli.patch |   16 ----------------
 phpMyAdmin.spec               |    7 ++++---
 sources                       |    2 +-
 4 files changed, 6 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1811d61..564cf6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-phpMyAdmin-3.3.5.1-all-languages.tar.bz2
+phpMyAdmin-3.3.6-all-languages.tar.bz2
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index ede38a2..9d0b5e2 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.3.5.1
+Version: 3.3.6
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -10,7 +10,6 @@ Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 Patch0: phpMyAdmin-3.3.3-vendor.patch
-Patch1: phpMyAdmin-3.3.5-mysqli.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -32,7 +31,6 @@ is available in over 55 languages.
 %prep
 %setup -q -n %{name}-%{version}-all-languages
 %patch0 -p1
-%patch1 -p1
 
 # Setup vendor config file
 sed -e "/'CHANGELOG_FILE'/s at ./ChangeLog@%{_datadir}/doc/%{name}-%{version}/ChangeLog@" \
@@ -71,6 +69,9 @@ rm -rf %{buildroot}
 %dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/config
 
 %changelog
+* Sun Aug 29 2010 Robert Scheck <robert at fedoraproject.org> 3.3.6-1
+- Upstream released 3.3.6 (#628301)
+
 * Fri Aug 20 2010 Robert Scheck <robert at fedoraproject.org> 3.3.5.1-1
 - Upstream released 3.3.5.1 (#625877, #625878)
 - Added patch to fix wrong variable check at nopassword (#622428)
diff --git a/sources b/sources
index 25d55e2..464c6d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf6a1de87b8b590703aaa61aafefc95a  phpMyAdmin-3.3.5.1-all-languages.tar.bz2
+34937c99ed5ef5706c8a862f29234688  phpMyAdmin-3.3.6-all-languages.tar.bz2