[meld/f15] New upstream release: Meld 1.6.0

[Dominic Hopf]

commit 89d41b83ef1617eb394b61250ba2c58de840201f
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sat May 5 17:58:10 2012 +0200

    New upstream release: Meld 1.6.0

 .gitignore |    1 +
 meld.spec  |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66101e7..fa975c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /meld-1.5.3.tar.xz
 /meld-1.5.4.tar.xz
+/meld-1.6.0.tar.xz
diff --git a/meld.spec b/meld.spec
index 82b3a4e..91ca2ae 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,12 +1,12 @@
 Name:		meld
-Version:	1.5.4
+Version:	1.6.0
 Release:	1%{?dist}
 Summary:	Visual diff and merge tool
 
 Group:		Development/Tools
 License:	GPLv2+
 URL:		http://meld.sourceforge.net/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.5/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.6/%{name}-%{version}.tar.xz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -81,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat May 05 2012 Dominic Hopf <dmaphy at fedoraproject.org> - 1.6.0-1
+- New upstream release: Meld 1.6.0
+
 * Sat Apr 07 2012 Dominic Hopf <dmaphy at fedoraproject.org> - 1.5.4-1
 - New upstream release: Meld 1.5.4
 
diff --git a/sources b/sources
index e0489a4..05c9ad6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f3929551d876ff45acf21b2c1e3e71a  meld-1.5.4.tar.xz
+c68b78586426d74a939d7f69eb88051e  meld-1.6.0.tar.xz