diff --git a/.cvsignore b/.cvsignore index f5fc7e4..51da68d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ nautilus-2.26.1.tar.bz2 +nautilus-2.26.2.tar.bz2 diff --git a/nautilus-2.23.5-selinux.patch b/nautilus-2.23.5-selinux.patch index 8ff1fb4..da1c91b 100644 --- a/nautilus-2.23.5-selinux.patch +++ b/nautilus-2.23.5-selinux.patch @@ -79,8 +79,8 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c.se "description", _("The SELinux security context of the file."), + "ellipsize", TRUE, NULL)); - - return columns; + columns = g_list_append (columns, + g_object_new (NAUTILUS_TYPE_COLUMN, diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c --- nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux 2009-02-16 09:45:37.000000000 +0100 +++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c 2009-02-16 17:20:33.000000000 +0100 diff --git a/nautilus.spec b/nautilus.spec index c824bf4..b4f5071 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -15,8 +15,8 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.26.1 -Release: 2%{?dist} +Version: 2.26.2 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2 @@ -87,11 +87,6 @@ Patch10: nautilus-gvfs-desktop-key-2.patch # http://bugzilla.gnome.org/show_bug.cgi?id=519743 Patch17: nautilus-filetype-symlink-fix.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=456515 -# Dragging Files via NFS share moves instead of copy -Patch18: nautilus-2.26.1-dnd-not-recurse.patch - - %description Nautilus is the file manager and graphical shell for the GNOME desktop that makes it easy to manage your files and the rest of your system. @@ -129,7 +124,6 @@ for developing nautilus extensions. # %patch8 -p1 -b .hide-white-screen %patch10 -p1 -b .gvfs-desktop-key %patch17 -p0 -b .symlink -%patch18 -p0 -b .dnd-recurse %build @@ -267,6 +261,9 @@ fi %changelog +* Mon Apr 13 2009 Alexander Larsson - 2.26.2-1 +- Update to 2.26.2 + * Mon Apr 6 2009 Tomas Bzatek - 2.26.1-2 - Fix dragging files via NFS moves instead of copy (#456515) diff --git a/sources b/sources index e138181..69bfddf 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 5d75f5de2806e9003e36a4613866b8d1 nautilus-2.26.1.tar.bz2 +6b9292ed9dde8b5f86a3b6df1422d5f8 nautilus-2.26.2.tar.bz2