Accepting request 46477 from GNOME:Factory

Copy from GNOME:Factory/nautilus based on submit request 46477 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/46477
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=83

nautilus-2.30.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83df19591c4d0d359fe67d16b3f73f71e6a2aa5ba7d477739276c7562f221144
-size 6156330

nautilus-2.31.90.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82f61085ee83458724d862c37dfecbad86ea3ec4f370aff74a46f45d8759e63c
+size 6143241

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.31.6.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/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.31.6.orig/data/nautilus.desktop.in.in
-+++ nautilus-2.29.1/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.31.6.orig/src/nautilus-file-management-properties.c
-+++ nautilus-2.29.1/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

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.31.6.orig/configure
-+++ nautilus-2.30.1/configure
++++ nautilus-2.31.6/configure
-@@ -19329,7 +19329,7 @@ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE
+@@ -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=""
  
  
- 
+ for ac_header in X11/XF86keysym.h
-Index: nautilus-2.30.1/configure.in
+Index: nautilus-2.31.6/configure.in
 ===================================================================
---- nautilus-2.30.1.orig/configure.in
+--- nautilus-2.31.6.orig/configure.in
-+++ nautilus-2.30.1/configure.in
++++ nautilus-2.31.6/configure.in
-@@ -339,7 +339,7 @@ AC_SUBST(CORE_CFLAGS)
+@@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS)
  CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
  AC_SUBST(CORE_LIBS)
  

nautilus.changes

@@ -1,3 +1,53 @@
+-------------------------------------------------------------------
+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
+
+- 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
 

nautilus.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package nautilus (Version 2.30.1)
+# spec file for package nautilus (Version 2.31.90)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -25,11 +25,11 @@ 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
 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
@@ -43,8 +43,9 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 License:        GPLv2+
 Group:          Productivity/File utilities
-Version:        2.30.1
+Version:        2.31.90
-Release:        6
+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
@@ -119,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
 
@@ -199,6 +204,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 +217,6 @@ fi
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/*
+%{_datadir}/gir-1.0/Nautilus-2.0.gir
 
 %changelog