rpms/gthumb/F-12 gthumb-importer,1.2,1.3 gthumb.spec,1.105,1.106

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/gthumb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11382

Modified Files:
	gthumb-importer gthumb.spec 
Log Message:
* Sun Jan 17 2010 Hans de Goede <hdegoede at redhat.com> - 2.10.11-8
- Fix gthumb-importer script gphoto2 mount detection to also
  work with translated mount names (#552890)



Index: gthumb-importer
===================================================================
RCS file: /cvs/pkgs/rpms/gthumb/F-12/gthumb-importer,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gthumb-importer	14 Jan 2010 10:22:35 -0000	1.2
+++ gthumb-importer	17 Jan 2010 15:47:00 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Nautilus passes a POSIX path; see if this is a gvfs gphoto2 mount
-if [[ "$1" =~ "$HOME/.gvfs/gphoto2" ]]; then
+if [[ "$1" =~ "$HOME/.gvfs/.*gphoto2" ]]; then
     # Hack for multi head cams, nautilus will call us for both heads,
     # but the second time we are started will fail because the device is in use
     if ! mkdir $HOME/.gthumb-importer.lock 2> /dev/null; then


Index: gthumb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gthumb/F-12/gthumb.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gthumb.spec	14 Jan 2010 10:22:36 -0000	1.105
+++ gthumb.spec	17 Jan 2010 15:47:00 -0000	1.106
@@ -9,7 +9,7 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.10.11
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 Source1: gthumb-importer
@@ -145,6 +145,10 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/gthumb.png
 
 %changelog
+* Sun Jan 17 2010 Hans de Goede <hdegoede at redhat.com> - 2.10.11-8
+- Fix gthumb-importer script gphoto2 mount detection to also
+  work with translated mount names (#552890)
+
 * Thu Jan 14 2010 Hans de Goede <hdegoede at redhat.com> - 2.10.11-7
 - Fix gthumb-importer script to properly unmount gvfs gphoto2 shares
   when called from nautilus to import photos (#552890)