From dc9df97250ee5c0dffb0a399da9715fabaeb8581 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 12 Aug 2007 01:26:03 +0000 Subject: [PATCH] fix the build --- gnome-vfs2.spec | 15 ++++++++++++--- posix.patch | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 posix.patch diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index 04e3fd5..07066c8 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -14,8 +14,10 @@ Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 Version: 2.19.3 -Release: 1%{?dist} -License: LGPL +Release: 2%{?dist} +License: LGPLv2 and LGPL+ and GPL+ +# the daemon and the library are LGPLv2 +# the modules are LGPL+ and GPL+ Group: System Environment/Libraries Source0: http://download.gnome.org/source/gnome-vfs/2.19/gnome-vfs-%{version}.tar.bz2 URL: http://www.gnome.org/ @@ -70,6 +72,8 @@ Patch6: gnome-vfs-2.15.91-mailto-command.patch # http://bugzilla.gnome.org/show_bug.cgi?id=356772 Patch8: gnome-vfs-2.16.0-no-dbus.patch +# +Patch9: posix.patch %description GNOME VFS is the GNOME virtual file system. It is the foundation of @@ -122,6 +126,7 @@ shares (SMB) to applications using GNOME VFS. %patch201 -p0 -b .console %patch8 -p1 -b .no-dbus +%patch9 -p1 -b .posix %build @@ -193,7 +198,7 @@ fi %files -f %{po_package}.lang %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%doc AUTHORS COPYING COPYING.LIB NEWS README %dir %{_sysconfdir}/gnome-vfs-2.0 %dir %{_sysconfdir}/gnome-vfs-2.0/modules @@ -224,6 +229,10 @@ fi %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Sat Aug 11 2007 Matthias Clasen - 2.19.3-2 +- Fix the build +- Update the license field + * Fri Jul 27 2007 Matthias Clasen - 2.19.3-1 - Update to 2.19.3 diff --git a/posix.patch b/posix.patch new file mode 100644 index 0000000..df7ae6b --- /dev/null +++ b/posix.patch @@ -0,0 +1,21 @@ +diff -up gnome-vfs-2.19.3/modules/smb-method.c.posix gnome-vfs-2.19.3/modules/smb-method.c +--- gnome-vfs-2.19.3/modules/smb-method.c.posix 2007-08-11 20:05:43.000000000 -0400 ++++ gnome-vfs-2.19.3/modules/smb-method.c 2007-08-11 20:06:17.000000000 -0400 +@@ -1546,7 +1546,7 @@ do_open (GnomeVFSMethod *method, + + /* Important: perform_authentication leaves and re-enters the lock! */ + while (perform_authentication (&actx) > 0) { +- file = smb_context->open (smb_context, path, unix_mode, 0666); ++ file = (smb_context->open) (smb_context, path, unix_mode, 0666); + actx.res = (file != NULL) ? GNOME_VFS_OK : gnome_vfs_result_from_errno (); + } + +@@ -1740,7 +1740,7 @@ do_create (GnomeVFSMethod *method, + + /* Important: perform_authentication leaves and re-enters the lock! */ + while (perform_authentication (&actx) > 0) { +- file = smb_context->open (smb_context, path, unix_mode, perm); ++ file = (smb_context->open) (smb_context, path, unix_mode, perm); + actx.res = (file != NULL) ? GNOME_VFS_OK : gnome_vfs_result_from_errno (); + } +