From 20e97b954ae2a8ead7ccb5124b4504da563a292bd1aa3aead8764b00bc80bf72 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 20 May 2009 20:47:25 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=59 --- nautilus-2.26.2.tar.bz2 | 3 -- nautilus-2.27.1.tar.bz2 | 3 ++ nautilus-bgo350950-search-desktop.diff | 19 ++++++------ ...962-folder-icon-for-menus-and-windows.diff | 28 ++++++++--------- nautilus.changes | 22 +++++++++++++ nautilus.spec | 31 +++++++++++++------ 6 files changed, 70 insertions(+), 36 deletions(-) delete mode 100644 nautilus-2.26.2.tar.bz2 create mode 100644 nautilus-2.27.1.tar.bz2 diff --git a/nautilus-2.26.2.tar.bz2 b/nautilus-2.26.2.tar.bz2 deleted file mode 100644 index cb01b55..0000000 --- a/nautilus-2.26.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c88a041667acb9085b7874acc6c6997317cc830d25d4d8c4b771e4cc4df15294 -size 5913284 diff --git a/nautilus-2.27.1.tar.bz2 b/nautilus-2.27.1.tar.bz2 new file mode 100644 index 0000000..105bfcd --- /dev/null +++ b/nautilus-2.27.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba6ff0a83201ec48236f6e50f74a6e487fd8b107d81d3d5542df69822920b6c2 +size 5814191 diff --git a/nautilus-bgo350950-search-desktop.diff b/nautilus-bgo350950-search-desktop.diff index 9c31439..9bd9f55 100644 --- a/nautilus-bgo350950-search-desktop.diff +++ b/nautilus-bgo350950-search-desktop.diff @@ -13,23 +13,22 @@ desktops. create mode 100644 nautilus-search.desktop.in -diff --git a/Makefile.am b/Makefile.am -index 7e134d9..997ae21 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,6 +8,7 @@ desktop_in_files = \ +Index: nautilus-2.27.1/data/Makefile.am +=================================================================== +--- nautilus-2.27.1.orig/data/Makefile.am ++++ nautilus-2.27.1/data/Makefile.am +@@ -10,6 +10,7 @@ desktop_in_files = \ nautilus.desktop.in \ nautilus-home.desktop.in \ nautilus-computer.desktop.in \ + nautilus-search.desktop.in \ nautilus-folder-handler.desktop.in \ nautilus-file-management-properties.desktop.in \ - nautilus-autorun-software.desktop.in -diff --git a/nautilus-search.desktop.in b/nautilus-search.desktop.in -new file mode 100644 -index 0000000..e8bc394 + nautilus-browser.desktop.in \ +Index: nautilus-2.27.1/data/nautilus-search.desktop.in +=================================================================== --- /dev/null -+++ b/nautilus-search.desktop.in ++++ nautilus-2.27.1/data/nautilus-search.desktop.in @@ -0,0 +1,113 @@ +[Desktop Entry] +Encoding=UTF-8 diff --git a/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff b/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff index e08cd82..ab9eaf0 100644 --- a/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff +++ b/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff @@ -15,10 +15,10 @@ folder is more recognizable than a filing cabinet. 4 files changed, 4 insertions(+), 4 deletions(-) -Index: nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in +Index: nautilus-2.27.1/data/nautilus-file-management-properties.desktop.in.in =================================================================== ---- nautilus-2.25.91.orig/nautilus-file-management-properties.desktop.in.in -+++ nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in +--- nautilus-2.27.1.orig/data/nautilus-file-management-properties.desktop.in.in ++++ nautilus-2.27.1/data/nautilus-file-management-properties.desktop.in.in @@ -3,7 +3,7 @@ Encoding=UTF-8 _Name=File Management _Comment=Change the behaviour and appearance of file manager windows @@ -28,10 +28,10 @@ Index: nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in Terminal=false Type=Application StartupNotify=true -Index: nautilus-2.25.91/nautilus.desktop.in.in +Index: nautilus-2.27.1/data/nautilus.desktop.in.in =================================================================== ---- nautilus-2.25.91.orig/nautilus.desktop.in.in -+++ nautilus-2.25.91/nautilus.desktop.in.in +--- nautilus-2.27.1.orig/data/nautilus.desktop.in.in ++++ nautilus-2.27.1/data/nautilus.desktop.in.in @@ -2,7 +2,7 @@ Encoding=UTF-8 _Name=File Manager @@ -41,11 +41,11 @@ Index: nautilus-2.25.91/nautilus.desktop.in.in Terminal=false Type=Application StartupNotify=true -Index: nautilus-2.25.91/src/nautilus-file-management-properties.c +Index: nautilus-2.27.1/src/nautilus-file-management-properties.c =================================================================== ---- nautilus-2.25.91.orig/src/nautilus-file-management-properties.c -+++ nautilus-2.25.91/src/nautilus-file-management-properties.c -@@ -806,7 +806,7 @@ nautilus_file_management_properties_dial +--- nautilus-2.27.1.orig/src/nautilus-file-management-properties.c ++++ nautilus-2.27.1/src/nautilus-file-management-properties.c +@@ -807,7 +807,7 @@ nautilus_file_management_properties_dial (GClosureNotify)g_object_unref, 0); @@ -54,11 +54,11 @@ Index: nautilus-2.25.91/src/nautilus-file-management-properties.c if (window) { gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window)); -Index: nautilus-2.25.91/src/nautilus-navigation-window.c +Index: nautilus-2.27.1/src/nautilus-navigation-window.c =================================================================== ---- nautilus-2.25.91.orig/src/nautilus-navigation-window.c -+++ nautilus-2.25.91/src/nautilus-navigation-window.c -@@ -1220,7 +1220,7 @@ static NautilusIconInfo * +--- nautilus-2.27.1.orig/src/nautilus-navigation-window.c ++++ nautilus-2.27.1/src/nautilus-navigation-window.c +@@ -1285,7 +1285,7 @@ static NautilusIconInfo * real_get_icon (NautilusWindow *window, NautilusWindowSlot *slot) { diff --git a/nautilus.changes b/nautilus.changes index 5d36dbb..b7bd07f 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed May 6 13:33:52 CEST 2009 - vuntz@novell.com + +- Update to version 2.27.1: + + Drop GTK+ deprecated symbols + + Display the application icon in the popup menu + + Fix autorun hints for Win32 software media + + Allow shift+return during typeahead find + + Update desktop icons according to DPI changes + + Use the correct folder icon fallbacks + + Autogenerate ChangeLog and use shave to display the build + output +- Update nautilus-bgo350950-search-desktop.diff and + nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff + so they apply. +- Use gnome-autogen.sh instead of autoreconf. + +------------------------------------------------------------------- +Sun May 3 10:12:19 CEST 2009 - mboman@suse.de + +- Change BuildRequires from unique-devel to libunique-devel + ------------------------------------------------------------------- Tue Apr 14 16:27:47 CEST 2009 - vuntz@novell.com diff --git a/nautilus.spec b/nautilus.spec index cd043e7..ea5513b 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.26.2) +# spec file for package nautilus (Version 2.27.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,13 +30,13 @@ BuildRequires: libbeagle-devel BuildRequires: libexempi-devel BuildRequires: libexif-devel BuildRequires: libgnomeui-devel +BuildRequires: libunique-devel BuildRequires: libxml2-devel -BuildRequires: unique-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files License: GPL v2 or later Group: Productivity/File utilities -Version: 2.26.2 +Version: 2.27.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 @@ -44,11 +44,11 @@ Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build # PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface Patch4: nautilus-bgo350950-search-desktop.diff -# PATCH-FIX-UPSTREAM nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff bnc117333 bgo350962 federico@novell.com - Use a folder icon instead of a file cabinet window +# PATCH-FIX-UPSTREAM nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff bnc117333 bgo350962 bgo581584 federico@novell.com - Use a folder icon instead of a file cabinet window Patch5: nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff # PATCH-NEEDS-REBASE nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com -- The upstream bug is still open, so we need to check if it's still needed (you just need a samba share to test). If yes, we should port the patch to gio Patch9: nautilus-146947-rename-bad-parameters-message.diff -# PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bgo335411 federico@novell.com +# PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bnc335411 federico@novell.com Patch15: nautilus-drives-and-volumes-on-desktop.diff # PATCH-FIX-OPENSUSE nautilus-bnc363122-lockdown-context-menus.diff bnc363122 federico@novell.com Patch20: nautilus-bnc363122-lockdown-context-menus.diff @@ -96,10 +96,7 @@ gnome-patch-translation-prepare gnome-patch-translation-update %build -# FIXME temporary workaround for 2.25.91 which was generated with an old -# gtk-doc: -gtkdocize --copy -autoreconf -f -i +NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-update-mimedb \ --enable-gtk-doc @@ -186,6 +183,22 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Wed May 06 2009 vuntz@novell.com +- Update to version 2.27.1: + + Drop GTK+ deprecated symbols + + Display the application icon in the popup menu + + Fix autorun hints for Win32 software media + + Allow shift+return during typeahead find + + Update desktop icons according to DPI changes + + Use the correct folder icon fallbacks + + Autogenerate ChangeLog and use shave to display the build + output +- Update nautilus-bgo350950-search-desktop.diff and + nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff + so they apply. +- Use gnome-autogen.sh instead of autoreconf. +* Sun May 03 2009 mboman@suse.de +- Change BuildRequires from unique-devel to libunique-devel * Tue Apr 14 2009 vuntz@novell.com - Update to version 2.26.2: + Fix issue with default dnd type when dragging to a parent