[shotwell] Update to 0.12.1

[Kalev Lember]

commit 71d1ea8bf9f6c1bc3ab700525b4fab0c65781942
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Apr 3 16:28:45 2012 +0300

    Update to 0.12.1
    
    - Don't buildrequire gnome-vfs (#690563)

 .gitignore    |    1 +
 shotwell.spec |   33 ++++++++++++++-------------------
 sources       |    2 +-
 3 files changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ecf2642..6f21294 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /shotwell-0.11.1.tar.bz2
 /shotwell-0.12.0-163bf4a114.tar.xz
 /shotwell-0.12.0-cf087489ea.tar.xz
+/shotwell-0.12.1.tar.bz2
diff --git a/shotwell.spec b/shotwell.spec
index 18ba1b0..7c803cb 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,9 +1,6 @@
-%global git     cf087489ea
-%global date    20111117
-
 Name:           shotwell
-Version:        0.12.0
-Release:        0.3.%{date}git%{git}%{?dist}
+Version:        0.12.1
+Release:        1%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -11,34 +8,27 @@ Group:          Applications/Multimedia
 # CC-BY-SA for some of the icons
 License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
-# git clone git://git.yorba.org/shotwell
-# cd shotwell
-# git archive --format=tar --prefix=%{name}-%{version}/ %{git} | xz - > %{name}-%{version}-%{git}.tar.xz
-Source0:        shotwell-%{version}-%{git}.tar.xz
-#Source0:        http://www.yorba.org/download/shotwell/0.11/shotwell-%{version}.tar.bz2
+Source0:        http://www.yorba.org/download/shotwell/0.12/shotwell-%{version}.tar.bz2
 # http://trac.yorba.org/ticket/3379
 Source1:        shotwell-icons.tar.bz2
 
 BuildRequires:  vala-devel >= 0.14
-#BuildRequires:  libxml2-devel
-#BuildRequires:  dbus-glib-devel
 BuildRequires:  LibRaw-devel
-#BuildRequires:  libusb-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(gee-1.0)
 BuildRequires:  pkgconfig(gexiv2)
-BuildRequires:  pkgconfig(gnome-vfs-2.0)
 BuildRequires:  pkgconfig(gstreamer-base-0.10)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gudev-1.0)
-BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libgphoto2)
 BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(rest-0.7)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(unique-3.0)
 BuildRequires:  pkgconfig(webkitgtk-3.0)
@@ -52,20 +42,21 @@ them, and share them with others.
 %setup -q
 
 %build
-./configure --prefix=%{_prefix} --lib=%{_lib} --disable-schemas-compile --assume-pkgs
+./configure \
+  --prefix=%{_prefix} \
+  --lib=%{_lib} \
+  --disable-schemas-compile \
+  --disable-icon-update
 echo CFLAGS=%{optflags} >> configure.mk
 make %{?_smp_mflags}
 
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export XDG_DISABLE_MAKEFILE_UPDATES=1
 # otherwise gettext always returns English text regardless of LANGUAGE asked
 export LANG=en_US.utf8
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
-
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell-viewer.desktop
 
@@ -111,6 +102,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Apr 03 2012 Kalev Lember <kalevlember at gmail.com> - 0.12.1-1
+- Update to 0.12.1
+- Don't buildrequire gnome-vfs (#690563)
+
 * Wed Feb 22 2012 Michel Salim <salimma at fedoraproject.org> - 0.12.0-0.3.20111117gitcf087489ea
 - Remove dependency on totem, unneeded since 0.10 (# 794487)
 
diff --git a/sources b/sources
index f38c906..db27670 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fba7efc0aba128ef223d1d3069d225b  shotwell-0.12.0-cf087489ea.tar.xz
+af2fa1f6d9ee498c0e23c23d8bb9fc7b  shotwell-0.12.1.tar.bz2