From 16eee2cf7b9050f42ce7ea1d5b4012f5d04ef183c1bdcaf2107b6c05f6d52a9e Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Mon, 29 Mar 2010 11:19:32 +0000
Subject: [PATCH] Accepting request 35644 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/nautilus via accept of submit request 35644 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/35644
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=90
---
 mount-archive.desktop |  9 +++++++++
 nautilus.changes      |  9 +++++++++
 nautilus.spec         | 13 +++++++------
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 mount-archive.desktop

diff --git a/mount-archive.desktop b/mount-archive.desktop
new file mode 100644
index 0000000..0542ee6
--- /dev/null
+++ b/mount-archive.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Archive Mounter
+Exec=/usr/lib/gvfs/gvfsd-archive file=%u
+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/zip;
+Terminal=false
+StartupNotify=false
+Type=Application
+NoDisplay=true
+OnlyShowIn=GNOME;
diff --git a/nautilus.changes b/nautilus.changes
index 907bd82..99c126f 100644
--- a/nautilus.changes
+++ b/nautilus.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Mar 24 13:55:04 CET 2010 - vuntz@opensuse.org
+
+- Add mount-archive.desktop to enable mounting an archive via gvfs,
+  instead of opening it in file-roller. FATE#308344, bgo#602147.
+- Stop creating %{_libdir}/nautilus/extensions-1.0: we don't
+  support extensions there anymore, so we shouldn't create the
+  directory.
+
 -------------------------------------------------------------------
 Fri Mar 12 12:15:22 CET 2010 - dimstar@opensuse.org
 
diff --git a/nautilus.spec b/nautilus.spec
index 0a3e6f3..64069ca 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -39,6 +39,8 @@ Version:        2.29.92.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
+# fate#308344 bgo#602147
+Source1:        mount-archive.desktop
 Source99:       baselibs.conf
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -115,8 +117,6 @@ rm $RPM_BUILD_ROOT/%{_libdir}/*.*a
 ### ln -s ../icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 # FIXME: this is probably wrong, but it enables the build to succeed for now
 # ln -s ../icons/gnome/24x24/devices/gnome-computer.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-### ln -s ../icons/gnome/24x24/places/gnome-fs-home.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-# ln -s ../icons/gnome/24x24/places/gnome-home.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 ln -s ../icons/gnome/24x24/actions/system-search.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 %suse_update_desktop_file -N "Nautilus" -G "File Browser" nautilus System FileManager
@@ -128,11 +128,13 @@ ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixm
 %suse_update_desktop_file -G "File Browser" nautilus-home System FileManager
 %suse_update_desktop_file -G "Nautilus Search Tool" nautilus-search System FileManager
 %suse_update_desktop_file -G "File Browser" network-scheme System Network
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0
+# Install the archive mime handler
+test ! -e %{buildroot}%{_datadir}/applications/mount-archive.desktop
+%{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mount-archive.desktop
+%suse_update_desktop_file mount-archive
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0
 %find_lang %{name}
 %find_gconf_schemas
-cat %{name}.schemas_list >%{name}.lst
 %fdupes $RPM_BUILD_ROOT
 
 %clean
@@ -156,7 +158,7 @@ if test -x usr/bin/update-mime-database ; then
     usr/bin/update-mime-database usr/share/mime >/dev/null
 fi
 
-%files -f %{name}.lst
+%files -f %{name}.schemas_list
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO
 %{_bindir}/*
@@ -170,7 +172,6 @@ fi
 %{_libexecdir}/nautilus-convert-metadata
 %doc %{_mandir}/man1/nautilus*.1.gz
 %dir %{_libdir}/nautilus
-%dir %{_libdir}/nautilus/extensions-1.0
 %dir %{_libdir}/nautilus/extensions-2.0
 
 %files lang -f %{name}.lang