[shotwell] bump to current git for vala 0.14 support, gtk+3 port

[Adam Williamson]

commit 593893c2d0ec49d227155262456a29224ace20bb
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Nov 10 22:22:51 2011 -0800

    bump to current git for vala 0.14 support, gtk+3 port

 .gitignore    |    1 +
 shotwell.spec |   49 +++++++++++++++++++++++++++----------------------
 sources       |    3 +--
 3 files changed, 29 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0798cdb..8cc55bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /shotwell-0.10.1.tar.bz2
 /shotwell-0.11.0.tar.bz2
 /shotwell-0.11.1.tar.bz2
+/shotwell-0.12.0-163bf4a114.tar.xz
diff --git a/shotwell.spec b/shotwell.spec
index 1a082f7..3e20b6e 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,6 +1,9 @@
+%global git     163bf4a114
+%global date    20111110
+
 Name:           shotwell
-Version:        0.11.1
-Release:        3%{?dist}
+Version:        0.12.0
+Release:        0.1.%{date}git%{git}%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -8,36 +11,37 @@ Group:          Applications/Multimedia
 # CC-BY-SA for some of the icons
 License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
-Source0:        http://www.yorba.org/download/shotwell/0.11/shotwell-%{version}.tar.bz2
+# 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
 # http://trac.yorba.org/ticket/3379
 Source1:        shotwell-icons.tar.bz2
 
-# git archive --format=tar --prefix=%{name}-%{version}/ \
-# `git svn find-rev %{svnrev}` | xz - > %{name}-%{version}-%{svnrev}.tar.xz
-#Source0:        shotwell-%{version}-%{svnrev}.tar.xz
-
-BuildRequires:  vala-devel >= 0.11.7
+BuildRequires:  vala-devel >= 0.14
 #BuildRequires:  libxml2-devel
 #BuildRequires:  dbus-glib-devel
 BuildRequires:  LibRaw-static
 #BuildRequires:  libusb-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(atk)
-BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(gee-1.0)
 BuildRequires:  pkgconfig(gexiv2)
 BuildRequires:  pkgconfig(gnome-vfs-2.0)
 BuildRequires:  pkgconfig(gstreamer-base-0.10)
-BuildRequires:  pkgconfig(gtk+-2.0)
+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(sqlite3)
-BuildRequires:  pkgconfig(unique-1.0)
-BuildRequires:  pkgconfig(webkit-1.0)
+BuildRequires:  pkgconfig(unique-3.0)
+BuildRequires:  pkgconfig(webkitgtk-3.0)
 # for thumbnailing; see http://trac.yorba.org/ticket/3439
 Requires:       totem
 
@@ -50,7 +54,7 @@ them, and share them with others.
 %setup -q
 
 %build
-./configure --prefix=%{_prefix} --lib=%{_lib} --disable-schemas-install --assume-pkgs
+./configure --prefix=%{_prefix} --lib=%{_lib} --disable-schemas-compile --assume-pkgs
 echo CFLAGS=%{optflags} >> configure.mk
 make %{?_smp_mflags}
 
@@ -62,7 +66,7 @@ export XDG_DISABLE_MAKEFILE_UPDATES=1
 export LANG=en_US.utf8
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
+#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
@@ -80,39 +84,40 @@ cat %{name}-extras.lang >> %{name}.lang
 
 %post
 update-desktop-database &>/dev/null || :
-%gconf_schema_upgrade shotwell
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-%pre
-%gconf_schema_prepare shotwell
-
-%preun
-%gconf_schema_remove shotwell
-
 %postun
 update-desktop-database &> /dev/null || :
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
   gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
+  /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 %posttrans
 gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
 %doc README COPYING MAINTAINERS NEWS THANKS AUTHORS
-%config(noreplace) %{_sysconfdir}/gconf/schemas/shotwell.schemas
 %{_bindir}/shotwell
 %{_bindir}/shotwell-video-thumbnailer
 %{_libdir}/shotwell
 %{_datadir}/shotwell
 %{_datadir}/applications/shotwell.desktop
 %{_datadir}/applications/shotwell-viewer.desktop
+%{_datadir}/GConf/gsettings/shotwell.convert
+%{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/icons/hicolor/*/apps/shotwell.png
 %{_datadir}/gnome/help/shotwell
 
 
 %changelog
+* Thu Nov 10 2011 Adam Williamson <awilliam at redhat.com> 0.12.0-1.20111110git163bf4a114
+- bump to current git to get vala 0.14 support for rawhide, GTK+ 3 port
+- adjust dependencies for vala, gtk, gsettings
+- adjust for gsettings port
+
 * Mon Nov  7 2011 Matthias Clasen <mclasen at redhat.com> 0.11.1-3
 - Rebuild against new libpng
 
diff --git a/sources b/sources
index 62b0ff2..d14150d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-1df95b65bb7689c10840faaa765bf931  shotwell-icons.tar.bz2
-e2c388bfce992b5437281c4fc29357d9  shotwell-0.11.1.tar.bz2
+39ab26af0ba45f7dc36ce2f3d0c16b8d  shotwell-0.12.0-163bf4a114.tar.xz