[gnome-disk-utility/f20-gnome-3-12] Update to 3.12.0

[Richard Hughes]

commit 8b0cc603c73b8828c2655d2cbdc077314ae2a43c
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Apr 14 16:08:38 2014 +0100

    Update to 3.12.0

 .gitignore                                 |    1 +
 0001-Be-more-careful-with-XIDs.patch       |   32 --------
 0002-Make-dialog-work-with-xid-again.patch |  110 ----------------------------
 gnome-disk-utility.spec                    |   25 ++----
 sources                                    |    2 +-
 5 files changed, 11 insertions(+), 159 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9647d15..524bd63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ gnome-disk-utility-2.30.1.tar.bz2
 /gnome-disk-utility-3.8.2.tar.xz
 /gnome-disk-utility-3.9.0.tar.xz
 /gnome-disk-utility-3.10.0.tar.xz
+/gnome-disk-utility-3.12.0.tar.xz
diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec
index 8632979..6fdfad1 100644
--- a/gnome-disk-utility.spec
+++ b/gnome-disk-utility.spec
@@ -10,16 +10,12 @@
 
 Summary: Disks
 Name: gnome-disk-utility
-Version: 3.10.0
-Release: 2%{?dist}
+Version: 3.12.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/browse/gnome-disk-utility
-Source0: http://download.gnome.org/sources/gnome-disk-utility/3.10/%{name}-%{version}.tar.xz
-
-# upstream fixes
-Patch0: 0001-Be-more-careful-with-XIDs.patch
-Patch1: 0002-Make-dialog-work-with-xid-again.patch
+Source0: http://download.gnome.org/sources/gnome-disk-utility/3.12/%{name}-%{version}.tar.xz
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
@@ -64,8 +60,6 @@ fstab/crypttab editing, ATA SMART and other features
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %if 0%{?enable_autoreconf}
@@ -80,13 +74,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/*.a
 
-desktop-file-install --delete-original  \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-disks.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-disk-image-mounter.desktop
-
 %find_lang %{name}
 
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+
 %post
 for d in hicolor HighContrast ; do
     touch --no-create %{_datadir}/icons/$d &>/dev/null || :
@@ -119,8 +111,6 @@ done
 %{_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
 %{_datadir}/icons/hicolor/*/apps/gnome-disks*
 %{_datadir}/icons/HighContrast/*/apps/gnome-disks.png
 
@@ -132,6 +122,9 @@ done
 %doc README AUTHORS NEWS COPYING
 
 %changelog
+* Mon Apr 14 2014 Richard Hughes <rhughes at redhat.com> - 3.12.0-1
+- Update to 3.12.0
+
 * Thu Jan  9 2014 Matthias Clasen <mclasen at redhat.com> - 3.10.0-2
 - Make formatting from nautilus work again
 
diff --git a/sources b/sources
index fa1d44b..a4c5e0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d89ad8a648a2003266737c00e36c40e6  gnome-disk-utility-3.10.0.tar.xz
+1cd6f0b8e434f35dc9dd18e1cd082be4  gnome-disk-utility-3.12.0.tar.xz