--- a/ChangeLog Wed Oct 08 13:52:45 2003 +0000
+++ b/ChangeLog Wed Oct 08 14:45:40 2003 +0000
@@ -1,3 +1,8 @@
+2003-10-08 Stephen Browne <[email protected]>
+
+ * gnome-vfs.spec: updated for 2.4.0
+ * patches/gnome-vfs-*: fixed to patch 2.4
+
2003-10-08 Mark McLoughlin <[email protected]>
* gnome-panel.spec: bump release to 12.
--- a/gnome-vfs.spec Wed Oct 08 13:52:45 2003 +0000
+++ b/gnome-vfs.spec Wed Oct 08 14:45:40 2003 +0000
@@ -1,12 +1,12 @@
Name: gnome-vfs
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.2.5
-Release: 15
-Distribution: Mercury
+Version: 2.4.0
+Release: 1
+Distribution: QuickSilver
Vendor: Sun Microsystems, Inc.
Summary: Virtual File System Library for GNOME
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.2/gnome-vfs-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.4/gnome-vfs-%{version}.tar.bz2
Source1: gnome-vfs-l10n-po.tar.bz2
Patch1: gnome-vfs-01-menu-setup.diff
Patch2: gnome-vfs-02-favorites.diff
@@ -36,9 +36,9 @@
Autoreqprov: on
Prereq: /sbin/ldconfig
-%define libbonobo_version 2.2.1
-%define GConf_version 2.2.0
-%define gnome_mime_data_version 2.2.0
+%define libbonobo_version 2.4.0
+%define GConf_version 2.4.0.1
+%define gnome_mime_data_version 2.4.0
%define cdparanoia_version IIIalpha9.8-361
Requires: libbonobo >= %{libbonobo_version}
@@ -152,6 +152,9 @@
%{_datadir}/gtk-doc/html/gnome-vfs-2.0
%changelog
+* Wed Oct 08 2003 - [email protected]
+- Updated to 2.4 for quicksilver
+
* Thu Aug 20 2003 - [email protected]
- Modified patch 15 to remove network-neighboorhood
and replaced it with network-places instead.
--- a/patches/gnome-vfs-01-menu-setup.diff Wed Oct 08 13:52:45 2003 +0000
+++ b/patches/gnome-vfs-01-menu-setup.diff Wed Oct 08 14:45:40 2003 +0000
@@ -14,7 +14,7 @@
- </And>
- </Query>
-
- <!-- Accesories -->
+ <!-- Accessories -->
<Folder>
<Name>Accessories</Name>
@@ -49,6 +39,7 @@
@@ -25,16 +25,9 @@
<Not>
<Keyword>System</Keyword>
</Not>
-@@ -60,17 +51,20 @@
- <!-- Other, catch-all unmatched folder -->
- <Folder>
- <Name>Other</Name>
-- <Desktop>Applications.directory</Desktop>
-+ <Desktop>Other.directory</Desktop>
- <OnlyUnallocated/>
+@@ -66,8 +57,11 @@
<Query>
-- <And>
-+ <And>
+ <And>
<Keyword>Application</Keyword>
+ <Keyword>X-Sun-Supported</Keyword>
<Not>
@@ -44,11 +37,6 @@
</Not>
</And>
</Query>
--
-+
- <Exclude>vumeter.desktop</Exclude>
- <Exclude>reclevel.desktop</Exclude>
- <Exclude>gnome-search-tool.desktop</Exclude>
@@ -87,6 +81,7 @@
<And>
<Keyword>Application</Keyword>
--- a/patches/gnome-vfs-12-network-all-users-support.diff Wed Oct 08 13:52:45 2003 +0000
+++ b/patches/gnome-vfs-12-network-all-users-support.diff Wed Oct 08 14:45:40 2003 +0000
@@ -1,13 +1,13 @@
--- gnome-vfs-2.2.3/modules/default-modules.conf 2003-07-04 03:49:18.000000000 -0700
+++ gnome-vfs-2.2.3.mod/modules/default-modules.conf 2003-07-04 03:46:32.000000000 -0700
-@@ -44,6 +44,7 @@
- all-preferences: libvfolder-desktop.so
- favorites: libvfolder-desktop.so
- network: libvfolder-desktop.so
-+network-all-users: libvfolder-desktop.so
- start-here: libvfolder-desktop.so
- system-settings: libvfolder-desktop.so
- server-settings: libvfolder-desktop.so
+@@ -46,6 +46,7 @@
+ all-preferences: vfolder-desktop
+ favorites: vfolder-desktop
+ network: vfolder-desktop
++network-all-users: vfolder-desktop
+ start-here: vfolder-desktop
+ system-settings: vfolder-desktop
+ server-settings: vfolder-desktop
--- gnome-vfs-2.2.3/modules/vfolder/Makefile.am 2002-12-17 00:41:25.000000000 -0800
+++ gnome-vfs-2.2.3.mod/modules/vfolder/Makefile.am 2003-07-04 03:46:56.000000000 -0700
@@ -25,7 +25,7 @@
--- a/patches/gnome-vfs-14-potfiles_in.diff Wed Oct 08 13:52:45 2003 +0000
+++ b/patches/gnome-vfs-14-potfiles_in.diff Wed Oct 08 14:45:40 2003 +0000
@@ -7,7 +7,7 @@
libgnomevfs/gnome-vfs-configuration.c
libgnomevfs/gnome-vfs-file-info.c
libgnomevfs/gnome-vfs-init.c
-@@ -7,8 +8,10 @@
+@@ -7,9 +8,11 @@
libgnomevfs/gnome-vfs-parse-ls.c
libgnomevfs/gnome-vfs-result.c
libgnomevfs/gnome-vfs-utils.c
@@ -16,5 +16,6 @@
modules/ftp-method.c
modules/http-method.c
modules/test-method.c
+ modules/cdemenu-desktop-method.c
monikers/GNOME_VFS_Moniker_std.server.in.in
+nfs.desktop.in
--- a/patches/gnome-vfs-17-quick-start-uri.diff Wed Oct 08 13:52:45 2003 +0000
+++ b/patches/gnome-vfs-17-quick-start-uri.diff Wed Oct 08 14:45:40 2003 +0000
@@ -43,9 +43,9 @@
--- gnome-vfs-2.2.3/modules/default-modules.conf 2003-07-21 12:31:17.000000000 -0700
+++ gnome-vfs-2.2.3-hacked/modules/default-modules.conf 2003-07-21 12:31:59.000000000 -0700
@@ -46,5 +46,6 @@
- start-here: libvfolder-desktop.so
- system-settings: libvfolder-desktop.so
- server-settings: libvfolder-desktop.so
-+quick-start: libvfolder-desktop.so
+ start-here: vfolder-desktop
+ system-settings: vfolder-desktop
+ server-settings: vfolder-desktop
++quick-start: vfolder-desktop
tar: tar
--- a/patches/gnome-vfs-20-extras-menu.diff Wed Oct 08 13:52:45 2003 +0000
+++ b/patches/gnome-vfs-20-extras-menu.diff Wed Oct 08 14:45:40 2003 +0000
@@ -2,11 +2,11 @@
--- gnome-vfs-2.2.5/modules/default-modules.conf 2003-08-01 11:42:49.000000000 -0700
+++ gnome-vfs-2.2.5-hacked/modules/default-modules.conf 2003-08-01 11:48:29.000000000 -0700
@@ -49,5 +49,7 @@
- system-settings: libvfolder-desktop.so
- server-settings: libvfolder-desktop.so
- quick-start: libvfolder-desktop.so
-+extras: libvfolder-desktop.so
-+extras-all-users: libvfolder-desktop.so
+ system-settings: vfolder-desktop
+ server-settings: vfolder-desktop
+ quick-start: vfolder-desktop
++extras: vfolder-desktop
++extras-all-users: vfolder-desktop
tar: tar
--- gnome-vfs-2.2.5/modules/vfolder/Makefile.am 2003-08-01 11:42:49.000000000 -0700