Sun Apr 19 02:17:33 UTC 2009

Author: mclasen

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

Modified Files:
	f-spot.spec 
Added Files:
	gvfs-gphoto.patch 
Removed Files:
	f-spot-0.1.11-libdir.patch f-spot-0.1.3-single.patch 
	f-spot-0.2.0-libgphoto2-port.patch f-spot-0.3.2-libdir.patch 
	f-spot-0.3.5-desktop-file-validate.patch 
	f-spot-0.3.5-screensaver.patch 
	f-spot-0.4.2-GalleryExport.patch 
	f-spot-0.4.2-link_system_libs.patch 
	f-spot-0.4.4-Makefile-destdir.patch f-spot-0.4.4-desktop.patch 
	f-spot-0.4.4-glib-sharp-2.12.0.patch 
	f-spot-0.4.4-gtk-deprecated.patch 
Log Message:
fix up photo import somewhat


gvfs-gphoto.patch:

--- 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-11/f-spot.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- f-spot.spec	24 Feb 2009 16:01:45 -0000	1.85
+++ f-spot.spec	19 Apr 2009 02:17:02 -0000	1.86
@@ -7,22 +7,21 @@
 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
 # Use system mono-addins
 Patch3:		f-spot-0.4.4-link-system-mono-addins.patch
 # fix a missing icon
 Patch4:		missing-icon.patch
+# unmount cameras before importing
+Patch5:		gvfs-gphoto.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
-BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 
+BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4
 BuildRequires:  gtk-sharp2-devel >= 2.7 libgnome-devel libgnomeui-devel
 BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
 BuildRequires:  gnome-sharp-devel gnome-desktop-sharp-devel gtk-sharp2-gapi
 BuildRequires:  gettext
 BuildRequires:  autoconf, automake, libtool, intltool
-BuildRequires:  perl(XML::Parser)
 BuildRequires:  gnome-doc-utils
 BuildRequires:  ndesk-dbus-glib-devel
 BuildRequires:  mono-addins-devel
@@ -34,7 +33,7 @@
 Requires(postun): desktop-file-utils
 
 # Mono only available on these: (s390x disabled for now)
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha 
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 # Some compiler segfault on ia64:
 ExcludeArch: ia64
@@ -45,7 +44,7 @@
 %description
 F-Spot is an application designed to provide personal photo management
 to the GNOME desktop. Features include import, export, printing and advanced
-sorting and tagging of digital images. 
+sorting and tagging of digital images.
 
 %prep
 %setup -q
@@ -53,9 +52,9 @@
 # preserve timestamps
 touch -r configure.in configure.in.stamp
 
-%patch0 -p1 -b .x-content
 %patch3 -p1 -b .link-system-mono-addins
 %patch4 -p1 -b .missing-icon
+%patch5 -p1 -b .gvfs-gphoto
 
 # restore timestamps
 touch -r configure.in.stamp configure.in
@@ -123,6 +122,10 @@
 %{_libdir}/gio-sharp-unstable
 
 %changelog
+* Sat Apr 18 2009 Matthias Clasen <mclasen at redhat.com> - 0.5.0.3-7
+- Avoid showing f-spot twice for photo imports
+- Make f-spot-import work with gvfs
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- f-spot-0.1.11-libdir.patch DELETED ---


--- f-spot-0.1.3-single.patch DELETED ---


--- f-spot-0.2.0-libgphoto2-port.patch DELETED ---


--- f-spot-0.3.2-libdir.patch DELETED ---


--- f-spot-0.3.5-desktop-file-validate.patch DELETED ---


--- f-spot-0.3.5-screensaver.patch DELETED ---


--- f-spot-0.4.2-GalleryExport.patch DELETED ---


--- f-spot-0.4.2-link_system_libs.patch DELETED ---


--- f-spot-0.4.4-Makefile-destdir.patch DELETED ---


--- f-spot-0.4.4-desktop.patch DELETED ---


--- f-spot-0.4.4-glib-sharp-2.12.0.patch DELETED ---


--- f-spot-0.4.4-gtk-deprecated.patch DELETED ---


