From fbd67cf47836fd9425c1dbb9203ca2d2a1e40a29d2ba1beb1369cb90df7ad54b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 6 Apr 2008 04:44:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=29 --- nautilus-2.22.0.tar.bz2 | 3 -- nautilus-2.22.1.tar.bz2 | 3 ++ nautilus-bnc366455-change-ownership.patch | 28 ---------- nautilus.changes | 28 ++++++++++ nautilus.spec | 64 +++++++++++++++-------- 5 files changed, 73 insertions(+), 53 deletions(-) delete mode 100644 nautilus-2.22.0.tar.bz2 create mode 100644 nautilus-2.22.1.tar.bz2 delete mode 100644 nautilus-bnc366455-change-ownership.patch diff --git a/nautilus-2.22.0.tar.bz2 b/nautilus-2.22.0.tar.bz2 deleted file mode 100644 index 5869143..0000000 --- a/nautilus-2.22.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43e2cfb22e97b7a67d9c02248e61f6529b2dafcf5ab29f13fd4d37bf696f50a1 -size 5116215 diff --git a/nautilus-2.22.1.tar.bz2 b/nautilus-2.22.1.tar.bz2 new file mode 100644 index 0000000..84de377 --- /dev/null +++ b/nautilus-2.22.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02792c5a9341bfe97859778f653147ef00d8637028e714bb21328a67d8844bab +size 5139139 diff --git a/nautilus-bnc366455-change-ownership.patch b/nautilus-bnc366455-change-ownership.patch deleted file mode 100644 index 665d5b9..0000000 --- a/nautilus-bnc366455-change-ownership.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugzilla.novell.com/show_bug.cgi?id=366455 - -Fix a crash when changing ownership of a file. -Patch taken from upstream svn. - ---- trunk/src/file-manager/fm-properties-window.c 2008/02/25 15:12:35 13817 -+++ trunk/src/file-manager/fm-properties-window.c 2008/03/12 10:22:11 13928 -@@ -1924,7 +1924,8 @@ - - static void - owner_change_callback (NautilusFile *file, -- GError *error, -+ GFile *result_location, -+ GError *error, - FMPropertiesWindow *window) - { - char *owner; -@@ -2067,7 +2068,9 @@ - g_assert (NAUTILUS_IS_FILE (file)); - - owner_text = combo_box_get_active_entry (combo_box, 0); -- name_array = g_strsplit (owner_text, " - ", 2); -+ if (! owner_text) -+ return; -+ name_array = g_strsplit (owner_text, " - ", 2); - new_owner = name_array[0]; - g_free (owner_text); - cur_owner = nautilus_file_get_owner_name (file); diff --git a/nautilus.changes b/nautilus.changes index 0132a1a..2c6a29c 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Apr 3 06:41:39 CEST 2008 - hpj@suse.de + +- Upgraded to version 2.22.1: + + * Fix crashes and leaks. + * Fix emblem display in property page. + * Fix mime choosing to not always create application/x-ext- type. + * Actually mount location in external connect to server dialog. + * Fix thumbnail size limit checks. + * Fix "show hidden" to also show backup files + (was broken in some situations). + * Verify that tracker is running before using it. + * Fix desktop file icon handling with absolute filenames. + * Use GDesktopAppInfos to launch desktop files. + * Don't follow symlinks for deep file count. + * Fix audio preview with later gstreamer. + * Make "move file over directory" overwrite case work. + * Sometimes we failed to ask for overwrite when move + operations falled back to copy + delete. + * Make sure we correctly transcode filenames when merging + directories if the directory is on another filesystem. + * Some moves were reported as copies, not moves in the ui + which could cause not up-to-date directory displays. + * Don't center file progress dialog if its already displayed. + +- Remove obsolete patch nautilus-bnc366455-change-ownership.patch. + ------------------------------------------------------------------- Fri Mar 28 19:13:46 CET 2008 - federico@novell.com diff --git a/nautilus.spec b/nautilus.spec index 6775877..6634672 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.22.0) +# spec file for package nautilus (Version 2.22.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ Name: nautilus BuildRequires: cdparanoia eel-devel fdupes gnome-common gnome-desktop-devel gnome-icon-theme gnome-patch-translation gvfs-devel intltool libbeagle-devel libexempi-devel libexif-devel libgnomeui-devel libidl-devel librsvg-devel perl-XML-Parser update-desktop-files License: GPL v2 or later Group: Productivity/File utilities -Version: 2.22.0 -Release: 13 +Version: 2.22.1 +Release: 1 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 @@ Patch18: nautilus-330298-297983-fix-overlapping-desktop-icons.diff Patch19: nautilus-desktop-icon.patch # PATCH-FIX-OPENSUSE nautilus-bnc363122-lockdown-context-menus.diff bnc363122 federico@novell.com Patch20: nautilus-bnc363122-lockdown-context-menus.diff -# PATCH-FIX-UPSTREAM nautilus-bnc366455-change-ownership.patch bnc366455 vuntz@novell.com -- Fix crash when changing ownership. Will be fixed in next upstream version. -Patch21: nautilus-bnc366455-change-ownership.patch Requires: gnome-icon-theme Requires: %{name}-lang = %{version} Requires: gvfs @@ -104,7 +102,6 @@ gnome-patch-translation-prepare ### %patch18 -p1 %patch19 -p1 %patch20 -p1 -%patch21 -p1 gnome-patch-translation-update %build @@ -188,6 +185,29 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Thu Apr 03 2008 hpj@suse.de +- Upgraded to version 2.22.1: + * Fix crashes and leaks. + * Fix emblem display in property page. + * Fix mime choosing to not always create application/x-ext- type. + * Actually mount location in external connect to server dialog. + * Fix thumbnail size limit checks. + * Fix "show hidden" to also show backup files + (was broken in some situations). + * Verify that tracker is running before using it. + * Fix desktop file icon handling with absolute filenames. + * Use GDesktopAppInfos to launch desktop files. + * Don't follow symlinks for deep file count. + * Fix audio preview with later gstreamer. + * Make "move file over directory" overwrite case work. + * Sometimes we failed to ask for overwrite when move + operations falled back to copy + delete. + * Make sure we correctly transcode filenames when merging + directories if the directory is on another filesystem. + * Some moves were reported as copies, not moves in the ui + which could cause not up-to-date directory displays. + * Don't center file progress dialog if its already displayed. +- Remove obsolete patch nautilus-bnc366455-change-ownership.patch. * Fri Mar 28 2008 federico@novell.com - Removed nautilus-158158-ignore-foreign-desktop-files.diff; it is obsolete. - Added nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff @@ -239,7 +259,7 @@ fi * Thu Feb 28 2008 rodrigo@suse.de - Added tags for all upstreamed patches, as well as bug numbers for all patches -* Wed Feb 20 2008 federico@novell.com +* Thu Feb 21 2008 federico@novell.com - Added nautilus-bnc363122-lockdown-disable-context-menus.diff to implement https://bugzilla.novell.com/show_bug.cgi?id=363122 - have a way to disable context menus in file views for quick-and-dirty kiosk setups. @@ -302,7 +322,7 @@ fi * Support direct save DnD (XDS) * Fix up octal permission display * Store window keep-above and stickines state across sessions -* Wed Sep 05 2007 maw@suse.de +* Thu Sep 06 2007 maw@suse.de - Don't require gnome2-user-docs, which now supplements nautilus (#297833). * Thu Aug 30 2007 maw@suse.de @@ -359,7 +379,7 @@ fi - Removed invalid desktop Category "Application" (#254654). * Mon Mar 26 2007 sbrabec@suse.cz - Fixed BuildRequires. -* Thu Mar 22 2007 maw@suse.de +* Fri Mar 23 2007 maw@suse.de - Update to version 2.18.0.1 - intltool is now a build requirement - Several code cleanups @@ -441,7 +461,7 @@ fi - Handle enter activation when using typeahead search - Avoid using gnome_vfs_is_local in wrong places - Translations -* Wed Aug 30 2006 jhargadon@suse.de +* Thu Aug 31 2006 jhargadon@suse.de - update to version 2.15.92.1 - Fix crash on startup - Fix crash on changing owner/group of file @@ -553,7 +573,7 @@ fi https://bugzilla.novell.com/show_bug.cgi?id=177777. All .desktop files were being filtered erroneously if they didn't have OnlyShowIn/NotShowIn keys. -* Mon May 22 2006 joeshaw@suse.de +* Tue May 23 2006 joeshaw@suse.de - Only patch in the nautilus-search.desktop file on SL, not SLE, since the new main menu has search built-in. (bnc #177551) * Wed May 17 2006 sbrabec@suse.cz @@ -602,7 +622,7 @@ fi - Removed dot-hidden.dif. This fixes bug #158158 completely; that patch is obsoleted by the updated nautilus-158158-ignore-foreign-desktop-files.diff. -* Tue Apr 18 2006 federico@novell.com +* Wed Apr 19 2006 federico@novell.com - Added nautilus-158158-ignore-foreign-desktop-files.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=158158. This makes Nautilus ignore .desktop files whose OnlyShowIn property indicates @@ -716,9 +736,9 @@ fi - Update to version 2.12.1 - Remove upstreamed patch - Re-diff some patches so that they apply to new version -* Fri Oct 07 2005 jpr@suse.de +* Sat Oct 08 2005 jpr@suse.de - Update beagle search patch -* Thu Oct 06 2005 federico@novell.com +* Fri Oct 07 2005 federico@novell.com - Added nautilus-desktop-file-fallback-icons.diff so that .desktop files which don't have an Icon property will fall back to some reasonable icons depending on the type of the .desktop file. @@ -730,7 +750,7 @@ fi - Added nautilus-consistent-home-folder-name.diff to make the name of $HOME consistent between the path bar and side bar in Nautilus and GtkFileChooser. -* Thu Sep 22 2005 clahey@suse.de +* Fri Sep 23 2005 clahey@suse.de - Turn off computer icon by default. * Fri Sep 16 2005 clahey@suse.de - Added nautilus-icon.patch to change main icon. bug #117333 @@ -754,9 +774,9 @@ fi - Update to version 2.11.92 * Tue Aug 16 2005 sbrabec@suse.cz - Updated nautilus-search patch from Joe Shaw. -* Thu Aug 11 2005 gekker@suse.de +* Fri Aug 12 2005 gekker@suse.de - Update to version 2.11.91 -* Tue Aug 02 2005 gekker@suse.de +* Wed Aug 03 2005 gekker@suse.de - Update to version 2.11.90 * Wed Jul 13 2005 sbrabec@suse.cz - Updated to version 2.11.2. @@ -778,7 +798,7 @@ fi kde services (#58875) * Mon Mar 14 2005 clahey@suse.de - Remove nautilus-background-memory.patch. Fixes 72063. -* Wed Mar 09 2005 gekker@suse.de +* Thu Mar 10 2005 gekker@suse.de - Update to version 2.10.0 (GNOME 2.10). * Mon Mar 07 2005 gekker@suse.de - Add nautilus-background-memory.patch @@ -805,7 +825,7 @@ fi - fix filelist * Thu Dec 16 2004 hvogel@suse.de - require gnome-icon-theme for the desktop file icons -* Wed Dec 15 2004 hvogel@suse.de +* Thu Dec 16 2004 hvogel@suse.de - fix desktop file * Tue Nov 23 2004 hhetter@suse.de - require gnome2-user-docs (#48272) @@ -833,16 +853,16 @@ fi - Added OnlyShowIn=GNOME;. * Tue Aug 24 2004 dave@suse.de - Added nautilus-location-crash.patch, ximian bug #63445 -* Thu Aug 19 2004 dave@suse.de +* Fri Aug 20 2004 dave@suse.de - Added nautilus-submount.patch, fixes ximian bug #63101 * Tue Aug 17 2004 dave@suse.de - Added nautilus-startup-notify.patch, fixes ximian bug #62605 -* Thu Aug 12 2004 dave@suse.de +* Fri Aug 13 2004 dave@suse.de - Added patches: nautilus-hide-desktop-files.patch - Update of nautilus-hide-separators.patch, fixes ximian bug #62339 nautilus-trim-desktop-menu.patch - fixes ximian bug #59110 -* Thu Jul 29 2004 dave@suse.de +* Fri Jul 30 2004 dave@suse.de - Added patches: nautilus-desktop-keybindings.patch nautilus-hide-separators.patch