- Version 1.8.4-1.

diff --git a/meld-glob.patch b/meld-glob.patch
deleted file mode 100644 (file)
index 1e30679..0000000
--- a/meld-glob.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meld-1.4.0/meld/vc/__init__.py     2010-10-16 16:21:54.138033646 +0200
-+++ meld-1.4.0/meld/vc/__init__.py.new 2010-10-16 16:22:36.518129763 +0200
-@@ -28,7 +28,7 @@
- def load_plugins():
-     _vcdir = os.path.dirname(os.path.abspath(__file__))
-     ret = []
--    for plugin in glob.glob(os.path.join(_vcdir, "[a-z]*.py")):
-+    for plugin in glob.glob(os.path.join(_vcdir, "[a-z]*.pyc")):
-         modname = "meld.vc.%s" % os.path.basename(os.path.splitext(plugin)[0])
-         ret.append( __import__(modname, globals(), locals(), "*") )
-     return ret

diff --git a/meld-version_control_plugins_glob.patch b/meld-version_control_plugins_glob.patch
new file mode 100644 (file)
index 0000000..c553a5b
--- /dev/null
+++ b/meld-version_control_plugins_glob.patch
@@ -0,0 +1,11 @@
+--- meld-1.8.4/meld/vc/__init__.py.version_control_plugins_glob        2014-04-28 13:12:56.446767163 +0200
++++ meld-1.8.4/meld/vc/__init__.py     2014-04-28 13:13:08.823971551 +0200
+@@ -30,7 +30,7 @@ from ._vc import DATA_NAME, DATA_STATE,
+ def load_plugins():
+     _vcdir = os.path.dirname(os.path.abspath(__file__))
+     ret = []
+-    for plugin in sorted(glob.glob(os.path.join(_vcdir, "[a-z]*.py"))):
++    for plugin in sorted(glob.glob(os.path.join(_vcdir, "[a-z]*.pyc"))):
+         modname = "meld.vc.%s" % os.path.basename(os.path.splitext(plugin)[0])
+         ret.append( __import__(modname, globals(), locals(), "*") )
+     return ret

diff --git a/meld.spec b/meld.spec
index 7d07d1871e4ca19dd179954c69a37a44e6841765..5cb617fa012d5f52639a88b9d755e989fa766b3f 100644 (file)
--- a/meld.spec
+++ b/meld.spec
@@ -1,18 +1,18 @@
-# TODO: make pl translation, commit it to gnome repository
-#       and attach pl.patch here ;)
+# TODO:
+# - make pl translation, commit it to gnome repository and attach pl.patch here ;)
 #
 Summary:       Visual diff and merge tool
 Summary(pl.UTF-8):     Wizualne narzędzie do oglądania i włączania zmian (diff)
 Name:          meld
-Version:       1.6.1
+Version:       1.8.4
 Release:       1
 License:       GPL
 Group:         Applications/Text
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/meld/1.6/%{name}-%{version}.tar.xz
-# Source0-md5: 50592969a05a6043439d30b0b52b66a7
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/meld/1.8/%{name}-%{version}.tar.xz
+# Source0-md5: d9e5038487ae0b8694191370fcc87fb8
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-GNUmakefile.patch
-Patch2:                %{name}-glob.patch
+Patch2:                %{name}-version_control_plugins_glob.patch
 URL:           http://meld.sourceforge.net/
 BuildRequires: gettext-devel
 BuildRequires: intltool
@@ -100,5 +100,11 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/%{name}/%{name}
 %{_iconsdir}/hicolor/*/apps/%{name}.png
 %{_iconsdir}/hicolor/*/apps/%{name}.svg
+%{_iconsdir}/HighContrast/scalable/apps/meld.svg
 %{_datadir}/%{name}
+%{_datadir}/appdata/meld.appdata.xml
+%{_datadir}/mime/packages/meld.xml
 %{_desktopdir}/%{name}.desktop
+
+
+