--- a/ChangeLog	Wed Mar 24 23:36:08 2004 +0000
+++ b/ChangeLog	Thu Mar 25 11:15:12 2004 +0000
@@ -1,3 +1,9 @@
+2004-03-25  Niall Power  <[email protected]>
+
+	* gnome-vfs.spec: bump to 2.6.0, update dependency versions and
+	  add dependencies on shared-mime-info.
+	* patches/gnome-vfs-g11n-potfiles.diff: ported to 2.6.0
+
 2004-03-25  Glynn Foster  <[email protected]>
 
 	* gtk2.spec: Juse JDS autotools.

--- a/gnome-vfs.spec	Wed Mar 24 23:36:08 2004 +0000
+++ b/gnome-vfs.spec	Thu Mar 25 11:15:12 2004 +0000
@@ -1,8 +1,8 @@
 Name:         gnome-vfs
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.5.7
-Release:      12
+Version:      2.6.0
+Release:      1
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 Summary:      Virtual File System Library for GNOME
@@ -34,9 +34,10 @@
 %define JDS_CBE_prefix /opt/jds
 
 %define autoconf_jds_version 2.58
-%define libbonobo_version 2.4.0
-%define GConf_version 2.4.0.1
-%define gnome_mime_data_version 2.4.0
+%define libbonobo_version 2.5.4
+%define GConf_version 2.5.1
+%define gnome_mime_data_version 2.4.1
+%define shared_mime_info_version 0.13
 %define cdparanoia_version IIIalpha9.8-361
 %define autoconf_jds__version 2.59
 %define automake_jds_version 1.8.2
@@ -45,11 +46,13 @@
 Requires:      libbonobo >= %{libbonobo_version}
 Requires:      GConf >= %{GConf_version}
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
+Requires:      shared-mime-info >= %{shared_mime_info_version}
 Requires:      cdparanoia >= %{cdparanoia_version}
 BuildRequires: autoconf-jds >= %{autoconf_jds_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: GConf-devel >= %{GConf_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
+BuildRequires: shared-mime-info >= %{shared_mime_info_version}
 BuildRequires: intltool
 BuildRequires: autoconf-jds >= %{autoconf_jds_version}
 BuildRequires: automake-jds >= %{automake_jds_version}
@@ -167,6 +170,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Mar 25 2004 - [email protected]
+- bumped to 2.6.0, updated dependency versions and
+  added a dependency on shared-mime-info
+
 * Thu Mar 11 2004 - [email protected]
 - added gnome-vfs-15-g11n-potfiles.diff
 

--- a/patches/gnome-vfs-15-g11n-potfiles.diff	Wed Mar 24 23:36:08 2004 +0000
+++ b/patches/gnome-vfs-15-g11n-potfiles.diff	Thu Mar 25 11:15:12 2004 +0000
@@ -10,11 +10,9 @@
  libgnomevfs/gnome-vfs-cdrom.c
  libgnomevfs/gnome-vfs-configuration.c
  libgnomevfs/gnome-vfs-file-info.c
-@@ -18,11 +18,11 @@
- modules/file-method.c
- modules/ftp-method.c
+@@ -20,8 +20,8 @@
  modules/http-method.c
-+modules/network-method.c
+ modules/network-method.c
  modules/test-method.c
 -nfs.desktop.in
  monikers/GNOME_VFS_Moniker_std.server.in.in
@@ -22,5 +20,3 @@
  schemas/desktop_default_applications.schemas.in
  schemas/desktop_gnome_url_handlers.schemas.in
  schemas/system_http_proxy.schemas.in
--modules/network-method.c
- schemas/system_smb.schemas.in