From: Jan Palus <atler@pld-linux.org>
Date: Sat, 9 Apr 2016 20:35:04 +0000 (+0200)
Subject: up to 1.14.0
X-Git-Tag: auto/th/marco-1.14.0-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=5fdbedbaa79d4b12da591822b4c1b5d46f2e5581;p=packages%2Fmarco.git

up to 1.14.0
---

diff --git a/marco.spec b/marco.spec
index 6d1c9f3..d08c70b 100644
--- a/marco.spec
+++ b/marco.spec
@@ -8,12 +8,12 @@
 Summary:	MATE Desktop window manager
 Summary(pl.UTF-8):	Zarządca okien środowiska MATE Desktop
 Name:		marco
-Version:	1.12.1
+Version:	1.14.0
 Release:	1
 License:	LGPL v2+ and GPL v2+
 Group:		X11/Window Managers
-Source0:	http://pub.mate-desktop.org/releases/1.12/%{name}-%{version}.tar.xz
-# Source0-md5:	e483b4e1c4c0a486f064147fff335d54
+Source0:	http://pub.mate-desktop.org/releases/1.14/%{name}-%{version}.tar.xz
+# Source0-md5:	4438119bbf7cae340594bbd861af24b2
 # https://bugzilla.gnome.org/show_bug.cgi?id=622517
 Patch0:		Allow-breaking-out-from-maximization-during-mouse.patch
 # https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/583847
@@ -149,9 +149,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libmarco-private.la
 
-# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/marco.convert
-
 desktop-file-install \
 	--remove-category="MATE" \
 	--delete-original \