[mate-menus/f20] add patches to spec file

[Wolfgang Ulbrich]

commit 6bc11400ffccc934595b5f441306d24a5a699adb
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Jun 20 17:08:35 2014 +0200

    add patches to spec file

 mate-menus.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/mate-menus.spec b/mate-menus.spec
index 31dffb5..210ed3d 100644
--- a/mate-menus.spec
+++ b/mate-menus.spec
@@ -1,15 +1,20 @@
 Name:           mate-menus
 Version:        1.6.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Displays menus for MATE Desktop
 License:        GPLv2+ and LGPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 Source1: 		mate-preferences-categories.menu
 
-# patch in upstream
-# https://github.com/mate-desktop/mate-menus/commit/e5734e2b6017c36fca8ab2403ed6cabfa7ef0d23
+# patches in upstream
+# https://github.com/mate-desktop/mate-menus/commit/e5734e2
 Patch0:         mate-menus_preferences-menu.patch
+# rhbz (#1097454)
+# https://github.com/mate-desktop/mate-menus/commit/f939339
+Patch1:         mate-menus_add-DefaultMergeDirs-for-applications-merged.patch
+# https://github.com/mate-desktop/mate-menus/commit/998e0385171594a0b12819ab59b82d2e9dd55278
+Patch2:         mate-menus_add-DefaultMergeDirs-for-preferences-merged.patch
 
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  mate-common
@@ -50,6 +55,8 @@ Development files for mate-menus
 %prep
 %setup -q
 %patch0 -p1 -b .preferences
+%patch1 -p1 -b .applications-merged
+%patch2 -p1 -b .preferences-merged
 
 # fedora specific
 # fix for usage of multimedia-menus package
@@ -101,6 +108,11 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 
 %changelog
+* Fri Jun 20 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-6
+- backport some 1.8.x upstream commits
+- support for games-menus
+- fix rhbz (#1097454)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild