rpms/gvfs/devel gvfs-64clean.patch,NONE,1.1 gvfs.spec,1.40,1.41

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11155

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-64clean.patch 
Log Message:
fix a 64bit issue


gvfs-64clean.patch:

--- NEW FILE gvfs-64clean.patch ---
diff -up gvfs-0.2.3/client/gvfsfusedaemon.c.64clean gvfs-0.2.3/client/gvfsfusedaemon.c
--- gvfs-0.2.3/client/gvfsfusedaemon.c.64clean	2008-04-11 23:00:42.000000000 -0400
+++ gvfs-0.2.3/client/gvfsfusedaemon.c	2008-04-11 23:01:17.000000000 -0400
@@ -55,8 +55,8 @@
 
 #define DEBUG_ENABLED 0
 
-#define GET_FILE_HANDLE(fi)     (GUINT_TO_POINTER ((guint) (fi)->fh))
-#define SET_FILE_HANDLE(fi, fh) ((fi)->fh = (guint64) GPOINTER_TO_UINT (fh))
+#define GET_FILE_HANDLE(fi)     ((gpointer) (fi)->fh))
+#define SET_FILE_HANDLE(fi, fh) ((fi)->fh = (guint64) (fh))
 
 typedef struct {
   time_t creation_time;


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gvfs.spec	8 Apr 2008 02:46:49 -0000	1.40
+++ gvfs.spec	12 Apr 2008 03:05:55 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,6 +34,7 @@
 BuildRequires: automake autoconf
 BuildRequires: libtool
 Patch1: gvfs-0.2.2-archive-integration.patch
+Patch2: gvfs-64clean.patch
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -63,6 +64,7 @@
 %prep
 %setup -q
 %patch1 -p0 -b .archive-integration
+%patch2 -p1 -b .64clean
 
 %build
 
@@ -176,6 +178,9 @@
 
 
 %changelog
+* Fri Apr 11 2008 Matthias Clasen <mclasen at redhat.com> - 0.2.3-2
+- Fix a crash of the fuse daemon on 64bit
+
 * Mon Apr  7 2008 Matthias Clasen <mclasen at redhat.com> - 0.2.3-1
 - Update to 0.2.3