From 8792a47d9381235d9c4ffcc8cf4a7678d640228d Mon Sep 17 00:00:00 2001
From: David Zeuthen <zeuthen@gmail.com>
Date: Tue, 18 Dec 2012 16:35:50 -0500
Subject: [PATCH] Update to 3.7.0

---
 .gitignore              |  1 +
 gnome-disk-utility.spec | 21 ++++++++++++++++-----
 sources                 |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 281c57a..3bc62b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ gnome-disk-utility-2.30.1.tar.bz2
 /gnome-disk-utility-3.5.3.tar.xz
 /gnome-disk-utility-3.6.0.tar.xz
 /gnome-disk-utility-3.6.1.tar.xz
+/gnome-disk-utility-3.7.0.tar.xz
diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec
index 122b971..006887e 100644
--- a/gnome-disk-utility.spec
+++ b/gnome-disk-utility.spec
@@ -1,6 +1,8 @@
-%define glib2_version             2.31.0
-%define gtk3_version              3.5.8
-%define udisks_version            1.99.0
+%define glib2_version                 2.31.0
+%define gtk3_version                  3.5.8
+%define udisks_version                2.0.90
+%define gnome_settings_daemon_version 3.6.0
+# TODO: see comment below about --disable-gsd-plugin
 
 # Only enable if using patches that touches configure.ac,
 # Makefile.am or other build system related files
@@ -9,7 +11,7 @@
 
 Summary: Disks
 Name: gnome-disk-utility
-Version: 3.6.1
+Version: 3.7.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -18,6 +20,7 @@ Source0: http://download.gnome.org/sources/gnome-disk-utility/3.6/%{name}-%{vers
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
+BuildRequires: gnome-settings-daemon-devel >= %{gnome_settings_daemon_version}
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: libudisks2-devel >= %{udisks_version}
@@ -58,7 +61,11 @@ fstab/crypttab editing, ATA SMART and other features
 %if 0%{?enable_autoreconf}
 autoreconf
 %endif
-%configure
+# TODO: Please remove --disable-gsd-plugin and bump %{gnome_settings_daemon_version} once
+#       there is a sufficiently new gnome-settings-daemon-devel package package available.
+#       See bgo #690310 for more information.
+#
+%configure --disable-gsd-plugin
 make %{?_smp_mflags}
 
 %install
@@ -94,6 +101,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
 %{_datadir}/applications/gnome-disks.desktop
 %{_datadir}/applications/gnome-disk-image-mounter.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.Disks.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gdu-sd.gschema.xml
 
 %dir %{_datadir}/gnome-disk-utility
 %{_datadir}/gnome-disk-utility/*.ui
@@ -104,6 +112,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
 %doc README AUTHORS NEWS COPYING
 
 %changelog
+* Tue Dec 18 2012 David Zeuthen <davidz@redhat.com> - 3.7.0-1%{?dist}
+- Update to 3.7.0
+
 * Fri Oct 05 2012 David Zeuthen <davidz@redhat.com> - 3.6.1-1%{?dist}
 - Update to 3.6.1
 
diff --git a/sources b/sources
index 4dc03ab..7e03ec9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff6e0a50a3a6aa9a8d9aa8b19d304485  gnome-disk-utility-3.6.1.tar.xz
+7212628557df3b21ab918d79acc5546c  gnome-disk-utility-3.7.0.tar.xz