[meld/f18] New upstream release: Meld 1.8.4

[Dominic Hopf]

commit 358d907d3551c0f133bbaa930160156a34cd62d3
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Mon Mar 10 22:43:21 2014 +0100

    New upstream release: Meld 1.8.4
    
    - fix RHBZ#1024318: use /usr/bin/python as python interpreter

 .gitignore |    1 +
 meld.spec  |    9 ++++++++-
 sources    |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7345491..ba4ec06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /meld-1.8.1.tar.xz
 /meld-1.8.2.tar.xz
 /meld-1.8.3.tar.xz
+/meld-1.8.4.tar.xz
diff --git a/meld.spec b/meld.spec
index 9ff6b53..9b07545 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,5 +1,5 @@
 Name:		meld
-Version:	1.8.3
+Version:	1.8.4
 Release:	1%{?dist}
 Summary:	Visual diff and merge tool
 
@@ -40,6 +40,9 @@ allows merges. The margins show location of changes for easy navigation.
 %prep
 %setup -q
 
+# RHBZ#1024318: Use specific python version we rely on
+sed -i "s|#! /usr/bin/env python|#\!/usr/bin/python|" ./bin/meld
+
 
 %build
 make prefix=%{_prefix} libdir=%{_datadir} sharedir=%{_datadir}
@@ -100,6 +103,10 @@ gtk-update-icon-cache %{_datadir}/icons/HighContrast &>/dev/null || :
 
 
 %changelog
+* Mon Mar 10 2014 Dominic Hopf <dmaphy at fedoraproject.org> - 1.8.4-1
+- New upstream release: Meld 1.8.4
+- fix RHBZ#1024318: use /usr/bin/python as python interpreter
+
 * Wed Jan 01 2014 Dominic Hopf <dmaphy at fedoraproject.org> - 1.8.3-1
 - New upstream release: Meld 1.8.3
 
diff --git a/sources b/sources
index 394b5b2..2c78528 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8254815c9358283e5e6a9d90f6846746  meld-1.8.3.tar.xz
+d9e5038487ae0b8694191370fcc87fb8  meld-1.8.4.tar.xz