[packages/meld] up to 3.20.0

[atler]

commit b8e2a79a67e4fcd0e59a58985b2443e208c1255a
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Jan 20 22:26:58 2019 +0100

    up to 3.20.0

 meld-desktop.patch | 17 ++++++++---------
 meld.spec          | 18 +++++++++---------
 2 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/meld.spec b/meld.spec
index baeded1..cd177ef 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,12 +1,12 @@
 Summary:	Visual diff and merge tool
 Summary(pl.UTF-8):	Wizualne narzędzie do oglądania i włączania zmian (diff)
 Name:		meld
-Version:	3.18.3
+Version:	3.20.0
 Release:	1
 License:	GPL
 Group:		Applications/Text
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/meld/3.18/%{name}-%{version}.tar.xz
-# Source0-md5:	81ab217622f856ee014f6b6c47a198f2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/meld/3.20/%{name}-%{version}.tar.xz
+# Source0-md5:	5b856d5690477c578b0b768c60b162ca
 Patch0:		%{name}-desktop.patch
 URL:		http://meld.sourceforge.net/
 BuildRequires:	intltool
@@ -90,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc NEWS README
+%doc NEWS
 %attr(755,root,root) %{_bindir}/%{name}
 %dir %{py3_sitescriptdir}/meld-*.egg-info
 %dir %{py3_sitescriptdir}/%{name}
@@ -106,13 +106,13 @@ rm -rf $RPM_BUILD_ROOT
 %{py3_sitescriptdir}/%{name}/vc/*.py
 %{py3_sitescriptdir}/%{name}/vc/__pycache__
 %{_iconsdir}/hicolor/*/actions/*.png
-%{_iconsdir}/hicolor/*/apps/%{name}.png
+%{_iconsdir}/hicolor/*/apps/org.gnome.meld.png
 %{_iconsdir}/hicolor/*/apps/*.svg
 %{_iconsdir}/hicolor/*/apps/meld-version-control.png
-%{_iconsdir}/HighContrast/scalable/apps/meld.svg
+%{_iconsdir}/HighContrast/scalable/apps/org.gnome.meld.svg
 %{_datadir}/%{name}
-%{_datadir}/appdata/meld.appdata.xml
+%{_datadir}/metainfo/org.gnome.meld.appdata.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml
-%{_datadir}/mime/packages/meld.xml
-%{_desktopdir}/%{name}.desktop
+%{_datadir}/mime/packages/org.gnome.meld.xml
+%{_desktopdir}/org.gnome.meld.desktop
 %{_mandir}/man1/%{name}.1*
diff --git a/meld-desktop.patch b/meld-desktop.patch
index edccbf2..4fb8108 100644
--- a/meld-desktop.patch
+++ b/meld-desktop.patch
@@ -1,13 +1,12 @@
-diff -uNr meld-1.6.0.old/data/meld.desktop.in meld-1.6.0/data/meld.desktop.in
---- meld-1.6.0.old/data/meld.desktop.in	2012-04-27 23:09:24.000000000 +0200
-+++ meld-1.6.0/data/meld.desktop.in	2012-05-14 13:50:15.306381836 +0200
-@@ -9,7 +9,8 @@
+diff -urN meld-3.20.0.orig/data/org.gnome.meld.desktop.in meld-3.20.0/data/org.gnome.meld.desktop.in
+--- meld-3.20.0.orig/data/org.gnome.meld.desktop.in	2019-01-20 22:21:14.767559143 +0100
++++ meld-3.20.0/data/org.gnome.meld.desktop.in	2019-01-20 22:21:50.094006006 +0100
+@@ -9,6 +9,6 @@
+ Terminal=false
  Type=Application
- Icon=meld
+ Icon=org.gnome.meld
+-MimeType=application/x-meld-comparison;
++MimeType=application/x-meld-comparison;text/x-patch;
  StartupNotify=true
 -Categories=GTK;Development;
 +Categories=GTK;GNOME;Development;
-+MimeType=text/x-patch;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=meld
- X-GNOME-Bugzilla-Component=general
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meld.git/commitdiff/b8e2a79a67e4fcd0e59a58985b2443e208c1255a