[f-spot] - Fix f-spot-import script (don't unmount gvfs mounts)

[chkr]

commit 1f77ffdfa02c2989442dc025b467524908722c15
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sun Oct 17 23:37:21 2010 +0200

    - Fix f-spot-import script (don't unmount gvfs mounts)

 0001-simplify-f-spot-import.patch           |   51 +++++++++++++++++++++
 0002-enhance-the-f-spot-import-script.patch |   63 ---------------------------
 f-spot.spec                                 |    9 +++-
 3 files changed, 57 insertions(+), 66 deletions(-)
---
diff --git a/0001-simplify-f-spot-import.patch b/0001-simplify-f-spot-import.patch
new file mode 100644
index 0000000..c01d173
--- /dev/null
+++ b/0001-simplify-f-spot-import.patch
@@ -0,0 +1,51 @@
+From 1f4c80816f1356d39b538d5f4a2a3326bdf276ff Mon Sep 17 00:00:00 2001
+From: Christian Krause <chkr at plauener.de>
+Date: Sun, 17 Oct 2010 23:08:19 +0200
+Subject: [PATCH] simplify f-spot-import
+
+- don't touch the supplied URL / path
+- don't umount gvfs gphoto2 mounts
+---
+ tools/f-spot-import |   31 ++-----------------------------
+ 1 files changed, 2 insertions(+), 29 deletions(-)
+
+diff --git a/tools/f-spot-import b/tools/f-spot-import
+index e27917e..05b6201 100755
+--- a/tools/f-spot-import
++++ b/tools/f-spot-import
+@@ -1,30 +1,3 @@
+-#!/bin/bash -x
++#!/bin/bash
+ 
+-udi="$1"
+-#xmessage $udi
+-
+-if [ "$udi" != "${udi#gphoto2:}" ]; then
+-	# gphoto2, as passed by gvfs/nautilus
+-	gvfs-mount -u "$udi" || true
+-	f-spot --import "$udi"
+-	exit
+-fi
+-mnt=${udi#file://}
+-if [ "$udi" != "$mnt" ]; then
+-	# mount point, as passed by gvfs/nautilus.
+-	f-spot --import "$udi"
+-	exit
+-fi
+-mount_point=`hal-get-property --udi="$udi" --key=volume.mount_point` || true
+-if [ -n "$mount_point" ]; then
+-	# USB Mass Storage camera: need to pass f-spot a mount point
+-	f-spot --import "$mount_point"
+-else
+-	# Some other camera try GPhoto2
+-
+-	bus=`hal-get-property --udi="$udi" --key=usb.bus_number`
+-	dev=`hal-get-property --udi="$udi" --key=usb.linux.device_number`
+-	uri=`printf gphoto2://[usb:%.3d,%.3d] $bus $dev`
+-
+-	f-spot --import "$uri"
+-fi
++f-spot --import "$1"
+-- 
+1.7.2.3
+
diff --git a/f-spot.spec b/f-spot.spec
index 74108b6..a2e8c31 100644
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -10,8 +10,8 @@ Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.8/f-spot-%{versi
 # upstream patch to prevent crash with empty databases
 # http://git.gnome.org/browse/f-spot/patch/?id=9054153b3b40f76f7e094ca8db98de0eaca62808
 Patch1:         0001-Don-t-crash-with-empty-databases.patch
-# unmount cameras before importing
-Patch3:         0002-enhance-the-f-spot-import-script.patch
+# don't unmount cameras before importing
+Patch3:         0001-simplify-f-spot-import.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -157,6 +157,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Sun Oct 17 2010 Christian Krause <chkr at fedoraproject.org> - 0.8.0-3
+- Fix f-spot-import script (don't unmount gvfs mounts)
+
 * Thu Sep 30 2010 Christian Krause <chkr at fedoraproject.org> - 0.8.0-2
 - Add upstream patch to prevent crash with empty databases