diff --git a/.cvsignore b/.cvsignore index 276ef7b..8666c79 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -nautilus-2.28.2.tar.bz2 +nautilus-2.28.4.tar.bz2 diff --git a/nautilus-2.28.0-revert-bg-fade-break.patch b/nautilus-2.28.0-revert-bg-fade-break.patch deleted file mode 100644 index ec4b0ff..0000000 --- a/nautilus-2.28.0-revert-bg-fade-break.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 96d03f31952dda243888313294137058269dfbf6 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 23 Sep 2009 17:48:33 -0400 -Subject: [PATCH] Revert "Emit APPEARANCE_CHANGED when setting the bg color" - -This reverts commit 7b86b78e2ff6a0f1b45ac8f8a9c30cf3d0c6ae96. ---- - eel/eel-background.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/eel/eel-background.c b/eel/eel-background.c -index 9c40629..81a4e61 100644 ---- a/eel/eel-background.c -+++ b/eel/eel-background.c -@@ -563,8 +563,6 @@ eel_background_set_color (EelBackground *background, - background->details->color = g_strdup (color); - - set_image_properties (background); -- -- g_signal_emit (background, signals[APPEARANCE_CHANGED], 0); - } - } - --- -1.6.4.2 - diff --git a/nautilus-2.29.xx-nautilus-directory-leak.patch b/nautilus-2.29.xx-nautilus-directory-leak.patch deleted file mode 100644 index 7601572..0000000 --- a/nautilus-2.29.xx-nautilus-directory-leak.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ac9f08eb1f74b32c432b0a4904fb57e982202a4c Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Tue, 08 Dec 2009 15:28:13 +0000 -Subject: Don't leak NautilusDirectory - ---- -diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c -index 5175118..cd48f7e 100644 ---- a/src/nautilus-navigation-window.c -+++ b/src/nautilus-navigation-window.c -@@ -1580,6 +1580,7 @@ real_sync_search_widgets (NautilusWindow *window) - navigation_window->details->temporary_search_bar = TRUE; - hide_temporary_bars (navigation_window); - } -+ nautilus_directory_unref (directory); - } - - --- -cgit v0.8.2 -From 2d61fcdf4987802441b7d9dab5364a28fb2dbd7c Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Tue, 08 Dec 2009 15:28:30 +0000 -Subject: Don't leak NautilusDirectory - ---- -diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c -index df16e1f..fdb1bdc 100644 ---- a/libnautilus-private/nautilus-file.c -+++ b/libnautilus-private/nautilus-file.c -@@ -6635,6 +6635,8 @@ nautilus_file_get_volume_free_space (NautilusFile *file) - get_fs_free_cb, - directory); /* Inherits ref */ - g_object_unref (location); -+ } else { -+ nautilus_directory_unref (directory); - } - - --- -cgit v0.8.2 diff --git a/nautilus.spec b/nautilus.spec index fbbfe75..8d0a33f 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -14,8 +14,8 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.28.2 -Release: 3%{?dist} +Version: 2.28.4 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2 @@ -82,17 +82,11 @@ Patch6: nautilus-2.28.1-dynamic-search.patch Patch7: rtl-fix.patch #Patch8: nautilus-2.22.1-hide-white-screen.patch -# from upstream -Patch9: nautilus-2.29.xx-nautilus-directory-leak.patch - Patch10: nautilus-gvfs-desktop-key-2.patch # http://bugzilla.gnome.org/show_bug.cgi?id=519743 Patch17: nautilus-filetype-symlink-fix.patch -# Need to file upstream and investigate a real fix -Patch18: nautilus-2.28.0-revert-bg-fade-break.patch - # https://bugzilla.gnome.org/show_bug.cgi?id=147808 Patch20: nautilus-monitor-change.patch @@ -130,10 +124,8 @@ for developing nautilus extensions. %patch6 -p1 -b .dynamic-search %patch7 -p1 -b .rtl-fix # %patch8 -p1 -b .hide-white-screen -%patch9 -p1 -b .memleaks %patch10 -p1 -b .gvfs-desktop-key %patch17 -p0 -b .symlink -%patch18 -p1 -b .revert-bg-fade-break %patch20 -p1 -b .nautilus-monitor-change %build @@ -270,6 +262,9 @@ fi %changelog +* Wed Dec 16 2009 Tomas Bzatek - 2.28.4-1 +- Update to 2.28.4 + * Thu Dec 10 2009 Jon McCann - 2.28.2-3 - Update the monitor changes patch (gnome #147808) diff --git a/sources b/sources index c5da0c2..a784750 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -872ac5a2b875a85473266aa540926596 nautilus-2.28.2.tar.bz2 +28c97e0e5195ae1ad5101e8b703cbf52 nautilus-2.28.4.tar.bz2