[meld] New upstream release: Meld 1.5

[Dominic Hopf]

commit f645f9b25512daf2dec8f1063ab2d506263c05f6
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sun Mar 13 17:04:36 2011 +0100

    New upstream release: Meld 1.5

 .gitignore |    1 +
 meld.spec  |   10 ++++++----
 sources    |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f512cb..055436f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 meld-1.3.1.tar.bz2
 /meld-1.3.2.tar.bz2
 /meld-1.4.0.tar.bz2
+/meld-1.5.0.tar.bz2
diff --git a/meld.spec b/meld.spec
index b21ee6e..4b020a7 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,12 +1,12 @@
 Name:		meld
-Version:	1.4.0
-Release:	2%{?dist}
+Version:	1.5.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.4/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.5/%{name}-%{version}.tar.bz2
 Patch1:		%{name}-scrollkeeper.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,13 +60,15 @@ desktop-file-install --vendor fedora                    \
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 
 %changelog
+* Sun Mar 13 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 1.5.0-1
+- New upstream release: Meld 1.5
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 13189bd..204a2ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b675ec2006c4452469cf501c51b2a689  meld-1.4.0.tar.bz2
+d08665bf6ce821f5eac5f49f38b5b454  meld-1.5.0.tar.bz2