[meld] New upstream release: Meld 1.7.3

Dominic Hopf dmaphy at fedoraproject.org
Tue Jun 4 22:07:18 UTC 2013


commit 84963afbd627591d51cb78ffc76ea273427b20c8
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Wed Jun 5 00:07:02 2013 +0200

    New upstream release: Meld 1.7.3

 .gitignore |    1 +
 meld.spec  |    9 +++++----
 sources    |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 82d45a1..41c08e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /meld-1.6.0.tar.xz
 /meld-1.7.0.tar.xz
 /meld-1.7.1.tar.xz
+/meld-1.7.3.tar.xz
diff --git a/meld.spec b/meld.spec
index 7b2b59b..b94912c 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,6 +1,6 @@
 Name:		meld
-Version:	1.7.1
-Release:	3%{?dist}
+Version:	1.7.3
+Release:	1%{?dist}
 Summary:	Visual diff and merge tool
 
 Group:		Development/Tools
@@ -9,7 +9,6 @@ URL:		http://meldmerge.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.7/%{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
-Patch0:		meld-1.7.1-Only-update-the-MIME-cache-when-DESTDIR-isnt.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -40,7 +39,6 @@ allows merges. The margins show location of changes for easy navigation.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -101,6 +99,9 @@ gtk-update-icon-cache %{_datadir}/icons/HighContrast &>/dev/null || :
 
 
 %changelog
+* Tue Jun 04 2013 Dominic Hopf <dmaphy at fedoraproject.org> - 1.7.3-1
+- New upstream release: Meld 1.7.3
+
 * Sat Mar 30 2013 Kalev Lember <kalevlember at gmail.com> - 1.7.1-3
 - More rpm scriptlet fixes
 - Use find_lang --with-gnome for the help documentation
diff --git a/sources b/sources
index 62020e3..dd6355f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4018bc3f20b64d2d8ef8194b3edb7486  meld-1.7.1.tar.xz
+80688ff72a8d8c5987d2dfb05bd0769c  meld-1.7.3.tar.xz


More information about the scm-commits mailing list