rpms/phpMyAdmin/EL-4 phpMyAdmin.htaccess, 1.1, 1.2 phpMyAdmin.spec, 1.10, 1.11 sources, 1.7, 1.8

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10162/EL-4

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-4/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 16:30:25 -0000	1.2
@@ -22,11 +22,11 @@
 </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>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phpMyAdmin.spec	23 Jul 2007 13:20:29 -0000	1.10
+++ phpMyAdmin.spec	6 Sep 2007 16:30:26 -0000	1.11
@@ -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 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at 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 at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:29 -0000	1.7
+++ sources	6 Sep 2007 16:30:26 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2