diff --git a/.cvsignore b/.cvsignore index 51da68d..d51c63e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -nautilus-2.26.1.tar.bz2 -nautilus-2.26.2.tar.bz2 +nautilus-2.26.3.tar.bz2 diff --git a/nautilus-2.26.2-icon-whitespace.patch b/nautilus-2.26.2-icon-whitespace.patch deleted file mode 100644 index 2c283ba..0000000 --- a/nautilus-2.26.2-icon-whitespace.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: libnautilus-private/nautilus-icon-container.c -=================================================================== ---- libnautilus-private/nautilus-icon-container.c (revision 15183) -+++ libnautilus-private/nautilus-icon-container.c (revision 15184) -@@ -1033,9 +1033,9 @@ - GtkAllocation *allocation; - gboolean reset_scroll_region; - -+ pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit; -+ - if (nautilus_icon_container_get_is_fixed_size (container)) { -- pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit; -- - /* Set the scroll region to the size of the container allocation */ - allocation = >K_WIDGET (container)->allocation; - eel_canvas_set_scroll_region -@@ -1090,7 +1090,7 @@ - if (nautilus_icon_container_is_auto_layout (container)) { - allocation = >K_WIDGET (container)->allocation; - x1 = MIN (x1, 0); -- x2 = MAX (x2, allocation->width); -+ x2 = MAX (x2, allocation->width / pixels_per_unit); - y1 = 0; - } else { - /* Otherwise we add the padding that is at the start of the diff --git a/nautilus.spec b/nautilus.spec index b2ce836..806fbc9 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -15,8 +15,8 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.26.2 -Release: 2%{?dist} +Version: 2.26.3 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2 @@ -87,9 +87,6 @@ Patch10: nautilus-gvfs-desktop-key-2.patch # http://bugzilla.gnome.org/show_bug.cgi?id=519743 Patch17: nautilus-filetype-symlink-fix.patch -# From svn (rev 15184) -Patch18: nautilus-2.26.2-icon-whitespace.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. @@ -127,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 .whitespace %build @@ -265,6 +261,9 @@ fi %changelog +* Tue May 19 2009 Tomas Bzatek - 2.26.3-1 +- Update to 2.26.3 + * Thu Apr 16 2009 Alexander Larsson - 2.26.2-2 - Fix excessive whitespace on the right in icon view when zooming - Fixes Gnome bug #579086 diff --git a/sources b/sources index 0723c35..aa3a194 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b9292ed9dde8b5f86a3b6df1422d5f8 nautilus-2.26.2.tar.bz2 +e05f1b61c27f506451f7d46509631e7b nautilus-2.26.3.tar.bz2