rpms/gnome-vfs2/devel gnome-vfs-2.13.92-permisssions-fix.patch, NONE, 1.1 gnome-vfs2.spec, 1.97, 1.98

[fedora-cvs-commits at redhat.com]

Author: alexl

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

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.13.92-permisssions-fix.patch 
Log Message:
* Tue Feb 28 2006 Alexander Larsson <alexl at redhat.com> - 2.13.92-2
- Add patch (from cvs) that fixes permission reading



gnome-vfs-2.13.92-permisssions-fix.patch:
 file-method.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE gnome-vfs-2.13.92-permisssions-fix.patch ---
Index: modules/file-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/file-method.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- modules/file-method.c	27 Feb 2006 08:54:52 -0000	1.154
+++ modules/file-method.c	28 Feb 2006 10:08:18 -0000	1.155
@@ -729,7 +729,6 @@ get_access_info (GnomeVFSFileInfo *file_
       * of the access calls
       */
 #ifdef G_OS_WIN32
-	file_info->permissions = 0;
 	if (g_access (full_name, R_OK) == 0) {
 		file_info->permissions |= GNOME_VFS_PERM_ACCESS_READABLE;
 	}
@@ -745,17 +744,16 @@ get_access_info (GnomeVFSFileInfo *file_
 	 * calls needed
 	 */
 	if (g_access (full_name, R_OK|W_OK) == 0) {
-		file_info->permissions = GNOME_VFS_PERM_ACCESS_READABLE | GNOME_VFS_PERM_ACCESS_WRITABLE;
+		file_info->permissions |= GNOME_VFS_PERM_ACCESS_READABLE | GNOME_VFS_PERM_ACCESS_WRITABLE;
 		if (g_access (full_name, X_OK) == 0) {
 			file_info->permissions |= GNOME_VFS_PERM_ACCESS_EXECUTABLE;
 		}
 	} else if (g_access (full_name, R_OK|X_OK) == 0) {
-		file_info->permissions = GNOME_VFS_PERM_ACCESS_READABLE | GNOME_VFS_PERM_ACCESS_EXECUTABLE;
+		file_info->permissions |= GNOME_VFS_PERM_ACCESS_READABLE | GNOME_VFS_PERM_ACCESS_EXECUTABLE;
 	} else {
 		if (g_access (full_name, R_OK) == 0) {
-			file_info->permissions = GNOME_VFS_PERM_ACCESS_READABLE;
+			file_info->permissions |= GNOME_VFS_PERM_ACCESS_READABLE;
 		} else {
-			file_info->permissions = 0;
 			if (g_access (full_name, W_OK) == 0) {
 				file_info->permissions |= GNOME_VFS_PERM_ACCESS_WRITABLE;
 			}


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gnome-vfs2.spec	27 Feb 2006 13:57:04 -0000	1.97
+++ gnome-vfs2.spec	28 Feb 2006 10:17:34 -0000	1.98
@@ -11,7 +11,7 @@
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
 Version: 2.13.92
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -41,6 +41,9 @@
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
+# Backport from cvs to fix permission reading
+Patch4: gnome-vfs-2.13.92-permisssions-fix.patch
+
 # send to upstream
 Patch101:	gnome-vfs-2.8.2-schema_about_for_upstream.patch
 
@@ -86,6 +89,7 @@
 %setup -q -n gnome-vfs-%{version} 
 
 %patch3 -p1 -b .modules-conf
+%patch4 -p0 -b .permissions-fix
 
 # send to upstream
 %patch101 -p1 -b .schema_about
@@ -182,6 +186,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Feb 28 2006 Alexander Larsson <alexl at redhat.com> - 2.13.92-2
+- Add patch (from cvs) that fixes permission reading
+
 * Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
 - Update to 2.13.92