- Update to 2.23.6.1

- Dropped upstreamed patches

.cvsignore

@@ -1 +1 @@
-nautilus-2.23.6.tar.bz2
+nautilus-2.23.6.1.tar.bz2

nautilus-2.22-default-to-asking.patch

@@ -1,11 +0,0 @@
---- nautilus-2.22.2/libnautilus-private/apps_nautilus_preferences.schemas.in.orig	2008-05-02 14:05:28.000000000 -0400
-+++ nautilus-2.22.2/libnautilus-private/apps_nautilus_preferences.schemas.in	2008-05-02 14:08:30.000000000 -0400
-@@ -122,7 +122,7 @@
-       <owner>nautilus</owner>
-       <type>list</type>
-       <list_type>string</list_type>
--      <default>[]</default>
-+      <default>[x-content/audio-cdda,x-content/video-dvd,x-content/audio-player,x-content/image-dcf,x-content/video-vcd,x-content/video-svcd,x-content/image-picturecd,x-content/video-hddvd,x-content/audio-dvd,x-content/blank-bd,x-content/blank-cd,x-content/blank-dvd,x-content/blank-hddvd,x-content/video-bluray]</default>
-       <locale name="C">
-          <short>List of x-content/* types to ask the user what to do on insertion</short>
-          <long>

nautilus.spec

@@ -18,7 +18,7 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.23.6
+Version: 	2.23.6.1
 Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
@@ -89,9 +89,6 @@ Patch8:		nautilus-2.22.1-hide-white-screen.patch
 
 Patch10:        nautilus-gvfs-desktop-key.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=444639
-Patch14:        nautilus-2.22-default-to-asking.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=171655
 Patch15:	nautilus-2.22.0-treeview-xds-dnd.patch
 
@@ -134,7 +131,6 @@ for writing nautilus extensions.
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p0 -b .gvfs-desktop-key
-%patch14 -p1 -b .default-to-asking
 %patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
 
@@ -255,6 +251,10 @@ fi
 
 
 %changelog
+* Mon Aug  4 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.23.6.1-1
+- Update to 2.23.6.1
+- Dropped upstreamed patches
+
 * Mon Aug  4 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.23.6-1
 - Update to 2.23.6
 

sources

@@ -1 +1 @@
-5bb12352ef6b9e1fc6986cd872228a37  nautilus-2.23.6.tar.bz2
+83a6ee496f994ee33272b86b3fdc81f9  nautilus-2.23.6.1.tar.bz2