From 12d59c3527c5807334d6163bb2d52f0e65880867f9f8b446359af83649b642ea Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 15 Aug 2010 12:07:17 +0000 Subject: [PATCH 1/3] Accepting request 45549 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/nautilus via accept of submit request 45549 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/45549 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=106 --- nautilus-2.30.1.tar.bz2 | 3 -- nautilus-2.31.6.tar.bz2 | 3 ++ ...962-folder-icon-for-menus-and-windows.diff | 31 +++++---------- nautilus-no-disable-deprecated.patch | 18 ++++----- nautilus.changes | 38 +++++++++++++++++++ nautilus.spec | 9 +++-- 6 files changed, 65 insertions(+), 37 deletions(-) delete mode 100644 nautilus-2.30.1.tar.bz2 create mode 100644 nautilus-2.31.6.tar.bz2 diff --git a/nautilus-2.30.1.tar.bz2 b/nautilus-2.30.1.tar.bz2 deleted file mode 100644 index d75e4ea..0000000 --- a/nautilus-2.30.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83df19591c4d0d359fe67d16b3f73f71e6a2aa5ba7d477739276c7562f221144 -size 6156330 diff --git a/nautilus-2.31.6.tar.bz2 b/nautilus-2.31.6.tar.bz2 new file mode 100644 index 0000000..fdb88b0 --- /dev/null +++ b/nautilus-2.31.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4745435df64c02f71c42274f532cfd1c757db37e028166e1314d6d9c77925c23 +size 6276915 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 74b51ef..ecdc3c7 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.29.1/data/nautilus-file-management-properties.desktop.in.in +Index: nautilus-2.31.6/data/nautilus-file-management-properties.desktop.in.in =================================================================== ---- nautilus-2.29.1.orig/data/nautilus-file-management-properties.desktop.in.in -+++ nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in +--- nautilus-2.31.6.orig/data/nautilus-file-management-properties.desktop.in.in ++++ nautilus-2.31.6/data/nautilus-file-management-properties.desktop.in.in @@ -2,7 +2,7 @@ _Name=File Management _Comment=Change the behaviour and appearance of file manager windows @@ -28,10 +28,10 @@ Index: nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in Terminal=false Type=Application StartupNotify=true -Index: nautilus-2.29.1/data/nautilus.desktop.in.in +Index: nautilus-2.31.6/data/nautilus.desktop.in.in =================================================================== ---- nautilus-2.29.1.orig/data/nautilus.desktop.in.in -+++ nautilus-2.29.1/data/nautilus.desktop.in.in +--- nautilus-2.31.6.orig/data/nautilus.desktop.in.in ++++ nautilus-2.31.6/data/nautilus.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] _Name=File Manager @@ -41,10 +41,10 @@ Index: nautilus-2.29.1/data/nautilus.desktop.in.in Terminal=false Type=Application StartupNotify=true -Index: nautilus-2.29.1/src/nautilus-file-management-properties.c +Index: nautilus-2.31.6/src/nautilus-file-management-properties.c =================================================================== ---- nautilus-2.29.1.orig/src/nautilus-file-management-properties.c -+++ nautilus-2.29.1/src/nautilus-file-management-properties.c +--- nautilus-2.31.6.orig/src/nautilus-file-management-properties.c ++++ nautilus-2.31.6/src/nautilus-file-management-properties.c @@ -807,7 +807,7 @@ nautilus_file_management_properties_dial (GClosureNotify)g_object_unref, 0); @@ -54,16 +54,3 @@ Index: nautilus-2.29.1/src/nautilus-file-management-properties.c if (window) { gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window)); -Index: nautilus-2.29.1/src/nautilus-navigation-window.c -=================================================================== ---- nautilus-2.29.1.orig/src/nautilus-navigation-window.c -+++ nautilus-2.29.1/src/nautilus-navigation-window.c -@@ -759,7 +759,7 @@ static NautilusIconInfo * - real_get_icon (NautilusWindow *window, - NautilusWindowSlot *slot) - { -- return nautilus_icon_info_lookup_from_name ("system-file-manager", 48); -+ return nautilus_icon_info_lookup_from_name ("gnome-fs-directory", 48); - } - - static void diff --git a/nautilus-no-disable-deprecated.patch b/nautilus-no-disable-deprecated.patch index b93a63b..e9d5c23 100644 --- a/nautilus-no-disable-deprecated.patch +++ b/nautilus-no-disable-deprecated.patch @@ -1,8 +1,8 @@ -Index: nautilus-2.30.1/configure +Index: nautilus-2.31.6/configure =================================================================== ---- nautilus-2.30.1.orig/configure -+++ nautilus-2.30.1/configure -@@ -19329,7 +19329,7 @@ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE +--- nautilus-2.31.6.orig/configure ++++ nautilus-2.31.6/configure +@@ -15942,7 +15942,7 @@ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" @@ -10,12 +10,12 @@ Index: nautilus-2.30.1/configure +DISABLE_DEPRECATED_CFLAGS="" - -Index: nautilus-2.30.1/configure.in + for ac_header in X11/XF86keysym.h +Index: nautilus-2.31.6/configure.in =================================================================== ---- nautilus-2.30.1.orig/configure.in -+++ nautilus-2.30.1/configure.in -@@ -339,7 +339,7 @@ AC_SUBST(CORE_CFLAGS) +--- nautilus-2.31.6.orig/configure.in ++++ nautilus-2.31.6/configure.in +@@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS) CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" AC_SUBST(CORE_LIBS) diff --git a/nautilus.changes b/nautilus.changes index 5d73cbc..5578718 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Fri Aug 13 10:26:48 UTC 2010 - dimstar@opensuse.org + +- Update to version 2.31.6: + + This release is based on 2.30.1 + + A long list of fixes have been backported from the master + branch, including: + - Expand and collapse folders with +/- in list view + - Rename .desktop files also change their name on disk + - Support overriding .gnome2 directory + - Save passwords for the session by default + - Remove deleted folders from the pathbar + - Replace libunique with GApplication + - Don't show 'File Browser' anymore in the window title + - Port to GDBus + - Change the default order for files in special directories + - Support relative paths in the location entry/dialog. + - Use folder icons as window icons in browser and spatial mode + - Add 'Trashed On' and 'Original Location' columns in the + trash + - Implement transparent icons for cut files + - Change default thumbnail size + - Fix a number of bugs related to bookmarks + - New dialog to handle conflicts within file copy/move + operations + - New button in the trashbar to restore selected items + - Use async I/O to save .gtk-bookmarks + - Fix a number of issues related to DnD in the places sidebar + - New icon for audio preview + - Don't show Unmount when showing Eject/Safe Removal + - Bump libnautilus-extension API version + - Fix a number of UI glitches + + Updated translations. +- Rebase patches: + + nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff + + nautilus-no-disable-deprecated.patch +- Add gobject-introspection-devel BuildRequires. + ------------------------------------------------------------------- Fri Aug 6 10:50:55 CEST 2010 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 0bd4312..20da3f1 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.30.1) +# spec file for package nautilus (Version 2.31.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,6 +25,7 @@ BuildRequires: gnome-common BuildRequires: gnome-desktop-devel BuildRequires: gnome-icon-theme BuildRequires: gnome-patch-translation +BuildRequireS: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libexempi-devel @@ -43,8 +44,8 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files License: GPLv2+ Group: Productivity/File utilities -Version: 2.30.1 -Release: 6 +Version: 2.31.6 +Release: 1 Summary: File Manager for the GNOME Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 # fate#308344 bgo#602147 @@ -199,6 +200,7 @@ fi %dir %{_libdir}/nautilus %dir %{_libdir}/nautilus/extensions-2.0 %{_libdir}/libnautilus-extension.so.* +%{_libdir}/girepository-1.0/Nautilus-2.0.typelib %files lang -f %{name}.lang @@ -211,5 +213,6 @@ fi %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/* +%{_datadir}/gir-1.0/Nautilus-2.0.gir %changelog From f9c490b1b75edcd313b943e2aa757a4e8000502125ee530a8ed8c4a4992bedbd Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 24 Aug 2010 14:10:00 +0000 Subject: [PATCH 2/3] Accepting request 45897 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/nautilus via accept of submit request 45897 revision 5. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/45897 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=107 --- nautilus-2.31.6.tar.bz2 | 3 --- nautilus-2.31.90.tar.bz2 | 3 +++ nautilus.changes | 12 ++++++++++++ nautilus.spec | 10 +++++++--- 4 files changed, 22 insertions(+), 6 deletions(-) delete mode 100644 nautilus-2.31.6.tar.bz2 create mode 100644 nautilus-2.31.90.tar.bz2 diff --git a/nautilus-2.31.6.tar.bz2 b/nautilus-2.31.6.tar.bz2 deleted file mode 100644 index fdb88b0..0000000 --- a/nautilus-2.31.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4745435df64c02f71c42274f532cfd1c757db37e028166e1314d6d9c77925c23 -size 6276915 diff --git a/nautilus-2.31.90.tar.bz2 b/nautilus-2.31.90.tar.bz2 new file mode 100644 index 0000000..a4733bc --- /dev/null +++ b/nautilus-2.31.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82f61085ee83458724d862c37dfecbad86ea3ec4f370aff74a46f45d8759e63c +size 6143241 diff --git a/nautilus.changes b/nautilus.changes index 5578718..4125aba 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Aug 18 15:45:51 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.31.90: + + Don't make pathbar buttons disappear when deleting a folder + + Remove useless unique-1.0 dependency + + Don't use deprecated GtkNotebookPage + + Translation updates +- Remove libunique-devel BuildRequires. +- Pass --disable-maintainer-mode to configure to have deprecated + gdk/gtk symbols and sed GDK_DISABLE_DEPRECATED out of eel/*. + ------------------------------------------------------------------- Fri Aug 13 10:26:48 UTC 2010 - dimstar@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 20da3f1..09626b9 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.31.6) +# spec file for package nautilus (Version 2.31.90) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,6 @@ BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libexempi-devel BuildRequires: libexif-devel -BuildRequires: libunique-devel BuildRequires: libxml2-devel # nautilus doesn't need the BuildRequires to build its modules for tracker and # beagle. But we keep this below for reference -- it's commented out to avoid @@ -44,7 +43,8 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files License: GPLv2+ Group: Productivity/File utilities -Version: 2.31.6 +Version: 2.31.90 +# FIXME: Check if the sed hacks for DEPRECATED symbols are still needed Release: 1 Summary: File Manager for the GNOME Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 @@ -120,9 +120,13 @@ gnome-patch-translation-prepare gnome-patch-translation-update %build +# FIXME: Check if the sed hacks for DEPRECATED symbols are still needed +sed -i "/-DGDK_DISABLE_DEPRECATED/d" eel/Makefile.{in,am} +sed -i "s/-DGDK_DISABLE_DEPRECATED//" configure.in NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-update-mimedb \ + --disable-maintainer-mode \ --enable-gtk-doc %__make %{?jobs:-j%jobs} V=1 From 6f206e29efdd1fec357aa11d782943cc5492bbd8bf6528245139591051d36bb8 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 27 Aug 2010 19:26:08 +0000 Subject: [PATCH 3/3] Accepting request 46477 from GNOME:Factory checked in (request 46477) OBS-URL: https://build.opensuse.org/request/show/46477 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=108 --- nautilus.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nautilus.spec b/nautilus.spec index 09626b9..3d7a65e 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -25,7 +25,7 @@ BuildRequires: gnome-common BuildRequires: gnome-desktop-devel BuildRequires: gnome-icon-theme BuildRequires: gnome-patch-translation -BuildRequireS: gobject-introspection-devel +BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libexempi-devel @@ -44,8 +44,8 @@ BuildRequires: update-desktop-files License: GPLv2+ Group: Productivity/File utilities Version: 2.31.90 -# FIXME: Check if the sed hacks for DEPRECATED symbols are still needed Release: 1 +# FIXME: Check if the sed hacks for DEPRECATED symbols are still needed Summary: File Manager for the GNOME Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 # fate#308344 bgo#602147