rpms/f-spot/F-10 gvfs-gphoto.patch,NONE,1.1 f-spot.spec,1.81,1.82

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3820

Modified Files:
	f-spot.spec 
Added Files:
	gvfs-gphoto.patch 
Log Message:
Ported the following fixes from F-11:
- Avoid showing f-spot twice for photo imports
- Make f-spot-import work with gvfs (BZ #485037)


gvfs-gphoto.patch:
 f-spot-import |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE gvfs-gphoto.patch ---
diff -up f-spot-0.5.0.3/tools/f-spot-import.gvfs f-spot-0.5.0.3/tools/f-spot-import
--- f-spot-0.5.0.3/tools/f-spot-import.gvfs	2009-04-18 21:56:21.248974676 -0400
+++ f-spot-0.5.0.3/tools/f-spot-import	2009-04-18 21:56:30.800987772 -0400
@@ -1,20 +1,20 @@
 #!/bin/bash
 
-udi="$1"
-#xmessage $udi
-mount_point=`hal-get-property --udi="$udi" --key=volume.mount_point`
-if [ -n "$mount_point" ]; then
-      # USB Mass Storage camera: need to pass f-spot a mount point
+URI=`gvfs-ls -c "$1/"`
 
-      f-spot --import "$mount_point"
-else
-     # Some other camera try GPhoto2
+if [ "${URI:0:10}" = "gphoto2://" ] ; then
+    # Yield for f-spot since it wants to access the device directly
+    #
+    gvfs-mount --unmount-scheme 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`
+    if [ "${URI:11:4}" = "usb:" ] ; then
+        # Rewrite the uri to something f-spot can handle
+        #
+        bus="${URI:15:3}"
+        dev="${URI:19:3}"
 
-     echo $uri
-
-     f-spot --import "$uri"
+        URI="gphoto2:usb:$bus,$dev"
+    fi
 fi
+
+f-spot --import "$URI"


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- f-spot.spec	4 Jan 2009 17:20:14 -0000	1.81
+++ f-spot.spec	25 Jul 2009 19:51:25 -0000	1.82
@@ -1,18 +1,18 @@
 Name:           f-spot
 Version:        0.5.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://download.gnome.org/sources/f-spot/0.5/f-spot-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=510325
-Patch0:		x-content.patch
 # I'm told this is fixed in SVN
 Patch1:		f-spot-0.4.4-gtk-deprecated.patch
 # fix a missing icon
 Patch2:		missing-icon.patch
+# unmount cameras before importing
+Patch3:		gvfs-gphoto.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -53,9 +53,9 @@ sorting and tagging of digital images. 
 # preserve timestamps
 touch -r configure.in configure.in.stamp
 
-%patch0 -p1 -b .x-content
 %patch1 -p1 -b .gtk-deprecated
 %patch2 -p1 -b .missing-icon
+%patch3 -p1 -b .gvfs-gphoto
 
 # restore timestamps
 touch -r configure.in.stamp configure.in
@@ -123,6 +123,10 @@ fi
 %{_libdir}/gio-sharp-unstable
 
 %changelog
+* Sat Jul 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.5.0.3-4
+- Avoid showing f-spot twice for photo imports
+- Make f-spot-import work with gvfs (BZ #485037)
+
 * Sun Jan 04 2009 Devan Goodwin <dgoodwin at redhat.com> 0.5.0.3-3
 - Merge in changes from devel spec file.