rpms/gnome-vfs2/devel gnome-vfs-2.12.1.1-mimecache.patch, NONE, 1.1 gnome-vfs2.spec, 1.65, 1.66

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18289

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.12.1.1-mimecache.patch 
Log Message:
Fix mime cache handling


gnome-vfs-2.12.1.1-mimecache.patch:
 xdgmimecache.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gnome-vfs-2.12.1.1-mimecache.patch ---
--- gnome-vfs-2.12.1.1/libgnomevfs/xdgmimecache.c.mimecache	2005-04-17 06:37:34.000000000 -0400
+++ gnome-vfs-2.12.1.1/libgnomevfs/xdgmimecache.c	2005-10-19 08:19:13.000000000 -0400
@@ -175,8 +175,8 @@
 	{
 	  for (j = 0; j < data_length; j++)
 	    {
-	      if ((cache->buffer[data_offset + j] & cache->buffer[mask_offset + j]) !=
-		  ((((unsigned char *) data)[j + i]) & cache->buffer[mask_offset + j]))
+	      if ((((unsigned char *)cache->buffer)[data_offset + j] & ((unsigned char *)cache->buffer)[mask_offset + j]) !=
+		  ((((unsigned char *) data)[j + i]) & ((unsigned char *)cache->buffer)[mask_offset + j]))
 		{
 		  valid_matchlet = FALSE;
 		  break;
@@ -187,7 +187,7 @@
 	{
 	  for (j = 0; j < data_length; j++)
 	    {
-	      if (cache->buffer[data_offset + j] != ((unsigned char *) data)[j + i])
+	      if (((unsigned char *)cache->buffer)[data_offset + j] != ((unsigned char *) data)[j + i])
 		{
 		  valid_matchlet = FALSE;
 		  break;


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gnome-vfs2.spec	6 Oct 2005 05:13:22 -0000	1.65
+++ gnome-vfs2.spec	19 Oct 2005 12:23:13 -0000	1.66
@@ -9,7 +9,7 @@
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
 Version: 2.12.1.1
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -48,6 +48,9 @@
 # Bug 150132
 Patch400: neon-0.24.7-gssapi.patch
 
+# fixed upstream
+Patch500: gnome-vfs-2.12.1.1-mimecache.patch
+
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -93,6 +96,7 @@
 %patch201 -p0 -b .console
 
 %patch400 -p0 -b .neon-gssapi 
+%patch500 -p0 -b .mimecache
 
 %build
 
@@ -171,6 +175,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Oct 19 2005 Matthias Clasen <mclasen at redhat.com> 2.12.1.1-2
+- Fix the cache handling in xdgmime
+
 * Thu Oct  6 2005 Matthias Clasen <mclasen at redhat.com> 2.12.1.1-1
 - Update to 2.12.1.1
 - Drop upstreamed patches