From b2ea1cea71a8ac4987d1d1031bda9a70d29ed462 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath@fedoraproject.org>
Date: Sep 06 2007 16:30:31 +0000
Subject: Updated new version, altered license and fixed mod_security issue listed in

    #279801

---

diff --git a/phpMyAdmin.htaccess b/phpMyAdmin.htaccess
index a72f1c1..d077500 100644
--- a/phpMyAdmin.htaccess
+++ b/phpMyAdmin.htaccess
@@ -22,11 +22,11 @@ Alias /phpMyAdmin /usr/share/phpMyAdmin
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index c1709c0..8fa1d7d 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath@redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath@redhat.com> 2.10.3-1
 - Upstream released new version
 
diff --git a/sources b/sources
index 509e447..5ff668b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2