[shotwell] Fix startup when invoked as /bin/shotwell (#812652)

[Kalev Lember]

commit 6436f3ef0ca4249a99a37eef5ae7f05a3a667ebb
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed May 2 09:08:24 2012 +0300

    Fix startup when invoked as /bin/shotwell (#812652)

 shotwell-usrmove.patch |   13 +++++++++++++
 shotwell.spec          |    9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/shotwell-usrmove.patch b/shotwell-usrmove.patch
new file mode 100644
index 0000000..3661222
--- /dev/null
+++ b/shotwell-usrmove.patch
@@ -0,0 +1,13 @@
+diff --git a/src/util/system.vala b/src/util/system.vala
+index a7b2d83..4fa80c9 100644
+--- a/src/util/system.vala
++++ b/src/util/system.vala
+@@ -12,7 +12,7 @@ int number_of_processors() {
+ // Return the directory in which Shotwell is installed, or null if uninstalled.
+ File? get_sys_install_dir(File exec_dir) {
+     File prefix_dir = File.new_for_path(Resources.PREFIX);
+-    return exec_dir.has_prefix(prefix_dir) ? prefix_dir : null;
++    return prefix_dir;
+ }
+ 
+ string get_nautilus_install_location() {
diff --git a/shotwell.spec b/shotwell.spec
index 5bf4c21..72ea06f 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,6 +1,6 @@
 Name:           shotwell
 Version:        0.12.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -11,6 +11,9 @@ URL:            http://www.yorba.org/shotwell/
 Source0:        http://www.yorba.org/download/shotwell/0.12/shotwell-%{version}.tar.bz2
 # http://trac.yorba.org/ticket/3379
 Source1:        shotwell-icons.tar.bz2
+# Fix installed prefix detection when invoked as /bin/shotwell
+# https://bugzilla.redhat.com/show_bug.cgi?id=812652
+Patch0:         shotwell-usrmove.patch
 
 BuildRequires:  vala-devel >= 0.14
 BuildRequires:  LibRaw-devel
@@ -40,6 +43,7 @@ them, and share them with others.
 
 %prep
 %setup -q
+%patch0 -p1 -b .usrmove
 
 %build
 ./configure \
@@ -101,6 +105,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed May 02 2012 Kalev Lember <kalevlember at gmail.com> - 0.12.2-2
+- Fix startup when invoked as /bin/shotwell (#812652)
+
 * Fri Apr 13 2012 Kalev Lember <kalevlember at gmail.com> - 0.12.2-1
 - Update to 0.12.2
 - Use find_lang --with-gnome for including help files