[meld/f20-gnome-3-12] Update to 3.12.0

[Richard Hughes]

commit 31165597c54b3f93e8daa41f793f87821daecd81
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Sep 29 16:25:09 2014 +0100

    Update to 3.12.0

 .gitignore |    1 +
 meld.spec  |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 12e228d..3cd818a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /meld-3.11.0.tar.xz
 /meld-3.11.2.tar.xz
 /meld-3.11.3.tar.xz
+/meld-3.12.0.tar.xz
diff --git a/meld.spec b/meld.spec
index ee1f020..c6d7f61 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,12 +1,12 @@
 Name:		meld
-Version:	3.11.3
+Version:	3.12.0
 Release:	1%{?dist}
 Summary:	Visual diff and merge tool
 
 Group:		Development/Tools
 License:	GPLv2+
 URL:		http://meldmerge.org/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.11/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.12/%{name}-%{version}.tar.xz
 # Don't run update-desktop-database and update-mime-database
 # Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=696903
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -103,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/HighContrast &>/dev/null || :
 
 
 %changelog
+* Mon Sep 29 2014 Richard Hughes <rhughes at redhat.com> - 3.12.0-1
+- Update to 3.12.0
+
 * Thu Sep 04 2014 Richard Hughes <rhughes at redhat.com> - 3.11.3-1
 - Update to 3.11.3
 
diff --git a/sources b/sources
index 001d77f..ac1ea36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36f4023a4afa1b24213d80c9d60723fc  meld-3.11.3.tar.xz
+9dbdb3306dc5d2415baeae3892bcec8e  meld-3.12.0.tar.xz