From cb2c2a06c410e4ad00edc66c09fa002f7c56751ef58ba7b2ea329c262b1e7488 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 8 Jun 2008 22:16:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=37 --- ...lus-bnc376669-always-update-thumbnail.patch | 18 ------------------ nautilus.changes | 6 ++++++ nautilus.spec | 8 ++++---- 3 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 nautilus-bnc376669-always-update-thumbnail.patch diff --git a/nautilus-bnc376669-always-update-thumbnail.patch b/nautilus-bnc376669-always-update-thumbnail.patch deleted file mode 100644 index 4d17312..0000000 --- a/nautilus-bnc376669-always-update-thumbnail.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -upr nautilus-2.22.2-pre/libnautilus-private/nautilus-directory-async.c nautilus-2.22.2-post/libnautilus-private/nautilus-directory-async.c ---- nautilus-2.22.2-pre/libnautilus-private/nautilus-directory-async.c 2008-05-19 17:50:02.000000000 -0500 -+++ nautilus-2.22.2-post/libnautilus-private/nautilus-directory-async.c 2008-05-19 20:12:31.000000000 -0500 -@@ -3921,13 +3921,7 @@ thumbnail_start (NautilusDirectory *dire - state->file = file; - state->cancellable = g_cancellable_new (); - -- if (file->details->thumbnail_size > 128) { -- state->tried_original = TRUE; -- state->trying_original = TRUE; -- location = nautilus_file_get_location (file); -- } else { -- location = g_file_new_for_path (file->details->thumbnail_path); -- } -+ location = g_file_new_for_path (file->details->thumbnail_path); - - directory->details->thumbnail_state = state; - diff --git a/nautilus.changes b/nautilus.changes index ae5f524..c8c4b72 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 8 22:00:26 CEST 2008 - hpj@suse.de + +- Back out nautilus-bnc376669-always-update-thumbnail.patch + (bnc#376669). It was causing continuous re-thumbnailing. + ------------------------------------------------------------------- Thu May 22 00:50:50 CEST 2008 - hpj@suse.de diff --git a/nautilus.spec b/nautilus.spec index 6fe2fae..b0e5131 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -16,7 +16,7 @@ BuildRequires: cdparanoia eel-devel fdupes gnome-common gnome-desktop-devel gno License: GPL v2 or later Group: Productivity/File utilities Version: 2.22.2 -Release: 25 +Release: 31 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -52,8 +52,6 @@ Patch20: nautilus-bnc363122-lockdown-context-menus.diff Patch21: nautilus-bnc368446-network-in-places.patch # PATCH-FIX-UPSTREAM nautilus-bnc-376070-null-exifdata-crash.patch bnc376070 hpj@novell.com Patch22: nautilus-bnc376070-null-exifdata-crash.patch -# PATCH-FIX-OPENSUSE nautilus-bnc376669-always-update-thumbnail.patch bnc376669 hpj@novell.com -Patch23: nautilus-bnc376669-always-update-thumbnail.patch # PATCH-FIX-UPSTREAM nautilus-bnc393226-dont-move-to-burn.patch bgo531750 bnc393226 hpj@novell.com Patch24: nautilus-bnc393226-dont-move-to-burn.patch Requires: gnome-icon-theme @@ -106,7 +104,6 @@ gnome-patch-translation-prepare %patch20 -p1 %patch21 %patch22 -p1 -%patch23 -p1 %patch24 -p2 gnome-patch-translation-update @@ -191,6 +188,9 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jun 09 2008 hpj@suse.de +- Back out nautilus-bnc376669-always-update-thumbnail.patch + (bnc#376669). It was causing continuous re-thumbnailing. * Thu May 22 2008 hpj@suse.de - Add nautilus-bnc393226-dont-move-to-burn.patch (bnc#393226). * Tue May 20 2008 hpj@suse.de