From 99e4de14b2f1f03dfbfd82727c17be45a7b20e91 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 5 Aug 2005 16:23:53 +0000
Subject: [PATCH] Unfinished update to 2.11.90

---
 .cvsignore      |  1 +
 gnome-vfs2.spec | 22 +++++++---------------
 sources         |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c3f6c40..267bd7d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ gnome-vfs-2.8.2.tar.bz2
 gnome-vfs-2.9.90.tar.bz2
 gnome-vfs-2.9.91.tar.bz2
 gnome-vfs-2.10.0.tar.bz2
+gnome-vfs-2.11.90.tar.bz2
diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 9b77a5d..32c8292 100644
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -8,12 +8,11 @@
 
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
-Version: 2.10.0
-Release: 5
+Version: 2.11.90
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
-Source1: desktop-method.c
 URL: http://www.gnome.org/
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
@@ -38,11 +37,6 @@ Prereq: GConf2 >= %{gconf2_version}
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
-## this is the automake-requiring patch
-Patch6: gnome-vfs-2.9.90-old-modules.patch
-
-Patch9: gnome-vfs-2.1.6-no-private-methods.patch
-
 # send to upstream
 Patch101:	gnome-vfs-2.8.2-schema_about_for_upstream.patch
 
@@ -96,11 +90,7 @@ shares (SMB) to applications using GNOME VFS.
 %prep
 %setup -q -n gnome-vfs-%{version} 
 
-cp -f %{SOURCE1} modules
-
 %patch3 -p1 -b .modules-conf
-%patch6 -p1 -b .old-modules
-%patch9 -p1 -b .no-private-methods
 
 # send to upstream
 %patch101 -p1 -b .schema_about
@@ -117,9 +107,6 @@ cp -f %{SOURCE1} modules
 
 %build
 
-# needed for patch6 (changing makefile to old vfolder backend)
-aclocal-1.6
-automake-1.6
 if pkg-config openssl ; then
 	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
 	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
@@ -195,6 +182,11 @@ done
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Fri Aug  5 2005 Matthias Clasen <mclasen@redhat.com> 2.11.90-1
+- New upstream version
+- Remove patches and sources for the desktop method, since
+  we don't have start-here in the UI anymore.
+
 * Fri Apr 29 2005 David Zeuthen <davidz@redhat.com> 2.10.0-5
 - Tweak the patch a bit so it applies
 
diff --git a/sources b/sources
index 1671834..8b0a983 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb9df65d6a77414bbde9f1bc429c9d97  gnome-vfs-2.10.0.tar.bz2
+e6c55660c8190eb3c58c90c1a6988044  gnome-vfs-2.11.90.tar.bz2