[phpMyAdmin] Upgrade to 3.5.1 (#819171)

[Robert Scheck]

commit d81000a73b5c9f24f1ed945581d33c3d3893d935
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun May 6 16:26:54 2012 +0200

    Upgrade to 3.5.1 (#819171)

 .gitignore          |    2 +-
 phpMyAdmin.htaccess |   26 ++++++++++++++++++--------
 phpMyAdmin.spec     |    7 +++++--
 sources             |    2 +-
 4 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fb287a..737a6c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-phpMyAdmin-3.5.0-all-languages.tar.bz2
+phpMyAdmin-3.?.*-all-languages.tar.bz2
diff --git a/phpMyAdmin.htaccess b/phpMyAdmin.htaccess
index e04cb36..e2d301f 100644
--- a/phpMyAdmin.htaccess
+++ b/phpMyAdmin.htaccess
@@ -18,18 +18,28 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
    </IfModule>
    <IfModule !mod_authz_core.c>
      # Apache 2.2
-     order deny,allow
-     deny from all
-     allow from 127.0.0.1
-     allow from ::1
+     Order Deny,Allow
+     Deny from All
+     Allow from 127.0.0.1
+     Allow from ::1
    </IfModule>
 </Directory>
 
 <Directory /usr/share/phpMyAdmin/setup/>
-   Order Deny,Allow
-   Deny from All
-   Allow from 127.0.0.1
-   Allow from ::1
+   <IfModule mod_authz_core.c>
+     # Apache 2.4
+     <RequireAny>
+       Require ip 127.0.0.1
+       Require ip ::1
+     </RequireAny>
+   </IfModule>
+   <IfModule !mod_authz_core.c>
+     # Apache 2.2
+     Order Deny,Allow
+     Deny from All
+     Allow from 127.0.0.1
+     Allow from ::1
+   </IfModule>
 </Directory>
 
 # These directories do not require access over HTTP - taken from the original
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 2398881..c6f8bbe 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -3,8 +3,8 @@
 
 Summary:	Handle the administration of MySQL over the World Wide Web
 Name:		phpMyAdmin
-Version:	3.5.0
-Release:	2%{?dist}
+Version:	3.5.1
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.phpmyadmin.net/
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{pkgname}/config
 
 %changelog
+* Sun May 06 2012 Robert Scheck <robert at fedoraproject.org> 3.5.1-1
+- Upgrade to 3.5.1 (#819171)
+
 * Sat May 05 2012 Remi Collet <remi at fedoraproject.org> 3.5.0-2
 - make configuration compatible apache 2.2 / 2.4
 
diff --git a/sources b/sources
index 499a1f8..38f47a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-984159d0bca857d57faf3a11c1b30af6  phpMyAdmin-3.5.0-all-languages.tar.bz2
+06bb0b8a945e114e767dfaec67dc5ae0  phpMyAdmin-3.5.1-all-languages.tar.bz2