[gnome-web-photo/f15/master] Update to 0.10

[Bastien Nocera]

commit a53e7e496a0669be1457d818ca61e8faa935043b
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Mar 9 14:27:14 2011 +0000

    Update to 0.10

 .gitignore                            |    1 +
 gnome-web-photo-0.3-libxul.patch      |  831 -----------------
 gnome-web-photo-0.6-xulfixbuild.patch |   43 -
 gnome-web-photo.spec                  |   66 +--
 sources                               |    2 +-
 xulrunner191.patch                    | 1599 ---------------------------------
 xulrunner192.patch                    |   12 -
 7 files changed, 14 insertions(+), 2540 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d71c3f..00bc329 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-web-photo-0.9.tar.bz2
+/gnome-web-photo-0.10.tar.bz2
diff --git a/gnome-web-photo.spec b/gnome-web-photo.spec
index d2e5080..86c6dba 100644
--- a/gnome-web-photo.spec
+++ b/gnome-web-photo.spec
@@ -1,30 +1,17 @@
-%define gecko_version 1.9.2.4
-
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
-Version: 0.9
-Release: 11%{?dist}
+Version: 0.10
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://download.gnome.org/sources/gnome-web-photo/%{version}/
 Source0: http://download.gnome.org/sources/gnome-web-photo/%{version}/%{name}-%{version}.tar.bz2
 
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires(post): GConf2
-Requires(preun): GConf2
-Requires: gecko-libs >= %{gecko_version}
-BuildRequires: gtk2-devel >= 2.10.0
 BuildRequires: libxml2-devel
-BuildRequires: gnome-vfs2-devel
-BuildRequires: gecko-devel-unstable >= %{gecko_version}
+BuildRequires: gtk3-devel
+BuildRequires: webkitgtk3-devel
 BuildRequires: libjpeg-devel
 BuildRequires: gettext intltool
-# Required for the xulrunner patch
-# BuildRequires: libtool gnome-common
-
-#Patch0: xulrunner191.patch
-#Patch1: gnome-web-photo-0.6-xulfixbuild.patch
-Patch2: xulrunner192.patch
 
 %description
 gnome-web-photo contains a thumbnailer that will be used by GNOME applications,
@@ -33,61 +20,32 @@ including the file manager, to generate screenshots of web pages.
 %prep
 %setup -q
 
-#%patch0 -p1 -b .xulrunner191
-#%patch1 -p1 -b .xulfixbuild
-%patch2 -p1 -b .xulrunner192
-
-# fix implicit linking causing FTBFS with the new ld in F13+
-sed -i -e 's/-lxpcomglue/-lxpcomglue -ldl -lnspr4/g' src/Makefile.am src/Makefile.in
-
 %build
-#autoreconf
-#libtoolize -f
-%configure
+%configure --with-gtk=3.0
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/thumbnailer.schemas \
-	$RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas
-
 %find_lang %{name}
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas >& /dev/null
-
-%pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule 				\
-	%{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas 		\
-	>& /dev/null || :
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas >& /dev/null
-fi
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog AUTHORS README TODO COPYING.README
-%{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas
-%{_bindir}/*
+%{_bindir}/gnome-web-photo
+%{_bindir}/gnome-web-print
+%{_bindir}/gnome-web-thumbnail
 %{_datadir}/gnome-web-photo
+%{_datadir}/thumbnailers/gnome-web-photo.thumbnailer
 
 %changelog
+* Wed Mar 09 2011 Bastien Nocera <bnocera at redhat.com> 0.10-1
+- Update to 0.10
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index e223fd0..951daf7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62952330a62b463df5fef315f4a7cb93  gnome-web-photo-0.9.tar.bz2
+42a1043a8937849dee023eea500143fb  gnome-web-photo-0.10.tar.bz2