--- a/ChangeLog	Sun Dec 30 01:32:40 2007 +0000
+++ b/ChangeLog	Sun Dec 30 22:12:26 2007 +0000
@@ -1,3 +1,8 @@
+2007-12-30  Damien Carbery <[email protected]>
+
+	* base-specs/nautilus.spec: Bump to 2.21.1. Hack: Disable most patches
+	  to try to get it to build.
+
 2007-12-30  Dave Lin  <[email protected]>
 
 	* cron-script.sh: There is online still containing option 

--- a/base-specs/nautilus.spec	Sun Dec 30 01:32:40 2007 +0000
+++ b/base-specs/nautilus.spec	Sun Dec 30 22:12:26 2007 +0000
@@ -11,21 +11,21 @@
 Name:         nautilus
 License:      GPL
 Group:        Productivity/File utilities
-Version:      2.20.0
+Version:      2.21.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      The GNOME Filemanager
 URL:          http://www.gnome.org
-Source:       http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.20/nautilus-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.21/nautilus-%{version}.tar.bz2
 Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 Source2:      http://dlc.sun.com/osol/jds/downloads/extras/nautilus-acl-icons-0.2.tar.bz2 
 #owner:stephen date:2004-10-29 type:bug bugster:5105006,5070031 bugzilla:137282
-Patch1:       nautilus-01-trash-only-home.diff
+##Patch1:       nautilus-01-trash-only-home.diff
 #owner:stephen date:2005-02-25 type:bug bugster:5011528
 Patch2:       nautilus-02-desktop-cluttered-icons.diff
 #owner:stephen date:2005-05-07 type:bug bugster:6238031 bugzilla:170761
-Patch3:       nautilus-03-ftp-rename.diff
+##Patch3:       nautilus-03-ftp-rename.diff
 #owner:stephen date:2004-11-10 type:bug bugster:6174222
 Patch4:      nautilus-04-execute-shellscript.diff
 #owner:stephen date:2005-06-17 type:branding
@@ -33,20 +33,20 @@
 #owner:stephen date:2005-05-20 type:feature bugster:6211279
 Patch6:      nautilus-06-frame-buffer.diff
 #owner:stephen date:2004-02-19 type:feature bugzilla:397715
-Patch7:      nautilus-07-lockdown.diff
+##Patch7:      nautilus-07-lockdown.diff
 #owner:alo date:2006-05-11 type:feature
-Patch8:      nautilus-08-acl.diff
+##Patch8:      nautilus-08-acl.diff
 #owner:gman date:2006-04-25 type:branding
 %if %option_with_sun_branding
-Patch9:      nautilus-09-interface-changes.diff
+##Patch9:      nautilus-09-interface-changes.diff
 %endif
 %if %option_with_indiana_branding
 Patch9:      nautilus-09-interface-changes-indiana.diff
 %endif
 #owner:stephen date:2006-07-12 type:feature
-Patch10:       nautilus-10-trusted-extensions.diff
+##Patch10:       nautilus-10-trusted-extensions.diff
 #owner:padraig date:2007-11-07 type:bug bugster:6620330 bugzilla:483884
-Patch11:       nautilus-11-thumbnail-fix.diff
+##Patch11:       nautilus-11-thumbnail-fix.diff
 #owner:padraig date:2007-11-23 type:feature bugster:6556913
 Patch12:       nautilus-12-star-desktop.diff
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -123,24 +123,24 @@
 bzcat %SOURCE1 | tar xf -
 cd po-sun; make; cd ..
 %endif
-%patch1 -p1
+##%patch1 -p1
 %patch2 -p1
-%patch3 -p1
+##%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
+##%patch7 -p1
+##%patch8 -p1
 %if %option_with_sun_branding
-%patch9 -p1
+##%patch9 -p1
 %endif
 %if %option_with_indiana_branding
 %patch9 -p1
 %endif
 %if %build_tjds
-%patch10 -p1 
+##%patch10 -p1 
 %endif
-%patch11 -p1
+##%patch11 -p1
 %patch12 -p1
 
 for po in po/*.po; do
@@ -231,6 +231,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Dec 30 2007 - [email protected]
+- Bump to 2.21.1. Hack: Disable most patches to try to get it to build.
 * Fri Nov 23 2007 - [email protected]
 - Add nautilus-12-star-desktop.diff to fix bug 6556913
 * Wed Nov 07 2007 - [email protected]