From 4ca5aeb085443d746d45a618a4521498e2335e0a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 25 Jul 2011 12:51:01 -0400
Subject: [PATCH] 3.1.3

---
 .gitignore       |  1 +
 simple-scan.spec | 45 ++++++++++++++++++++++++++-------------------
 sources          |  2 +-
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index b0e305c..761fb99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ simple-scan-2.31.5.tar.bz2
 /simple-scan-2.31.91.tar.bz2
 /simple-scan-2.32.0.1.tar.gz
 /simple-scan-2.32.0.2.tar.bz2
+/simple-scan-3.1.3.tar.xz
diff --git a/simple-scan.spec b/simple-scan.spec
index c051832..bb3bc26 100644
--- a/simple-scan.spec
+++ b/simple-scan.spec
@@ -1,21 +1,26 @@
 Name:           simple-scan
-Version:        2.32.0.2
+Version:        3.1.3
 Release:        1%{?dist}
 Summary:        Simple scanning utility
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            https://launchpad.net/simple-scan
-Source0:        http://launchpad.net/simple-scan/trunk/%{version}/+download/simple-scan-%{version}.tar.bz2
-
-BuildRequires: intltool GConf2-devel gtk2-devel autoconf automake
-BuildRequires: libgudev-devel sane-backends-devel gnome-doc-utils
-BuildRequires: dbus-glib-devel
-
-Requires: gnome-icon-theme xdg-utils yelp
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
+Source0:        http://download.gnome.org/sources/simple-scan/3.1/%{name}-%{version}.tar.xz
+
+BuildRequires: intltool
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gnome-doc-utils
+BuildRequires: vala
+BuildRequires: gtk3-devel
+BuildRequires: libgudev-devel
+BuildRequires: colord-devel
+BuildRequires: sane-backends-devel
+
+Requires: gnome-icon-theme
+Requires: xdg-utils
+Requires: yelp
 
 %description
 Simple Scan is an easy-to-use application, designed to let users connect their
@@ -33,25 +38,27 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name} --with-man --with-gnome
 
-%pre
-%gconf_schema_prepare %{name}
+%postun
+if [ $1 -eq 0]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
 
-%post
-%gconf_schema_upgrade %{name}
-
-%preun
-%gconf_schema_remove %{name}
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS README COPYING ChangeLog
 %{_mandir}/man1/simple-scan.1.gz
-%{_sysconfdir}/gconf/schemas/simple-scan.schemas
 %{_bindir}/simple-scan
 %{_datadir}/applications/simple-scan.desktop
 %{_datadir}/simple-scan/
+%{_datadir}/glib-2.0/schemas/org.gnome.SimpleScan.gschema.xml
 
 %changelog
+* Mon Jul 25 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.3-1
+- Update to 3.1.3
+
 * Tue Apr 26 2011 Matthias Clasen <mclasen@redhat.com> - 2.32.0.2-1
 - Update to 2.32.0.2
 
diff --git a/sources b/sources
index 8c0e975..7e5909b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8435b0a31aba1255caf685eb57b18e06  simple-scan-2.32.0.2.tar.bz2
+ddb4696e0bf9fab628142e08fbaa6a04  simple-scan-3.1.3.tar.xz