[mate-menus: 2/2] fix games-menu

[Wolfgang Ulbrich]

commit 2c9a38e6a5320aede5fbc147ea3ebd403b77bd73
Merge: 55b3d86 9db6cc5
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sun Jun 22 20:25:36 2014 +0200

    fix games-menu

 mate-menus.spec |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)
---
diff --cc mate-menus.spec
index 52072c4,73f0e76..6ce0450
--- a/mate-menus.spec
+++ b/mate-menus.spec
@@@ -1,21 -1,13 +1,12 @@@
  Name:           mate-menus
- Version:        1.6.0
- Release:        7%{?dist}
+ Version:        1.8.0
 -Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        Displays menus for MATE Desktop
  License:        GPLv2+ and LGPLv2+
  URL:            http://mate-desktop.org
 -Source0:        http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
 -Source1:        mate-preferences-categories.menu
 +Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 +Source1: 		mate-preferences-categories.menu
  
- # 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:  chrpath
  BuildRequires:  gobject-introspection-devel
  BuildRequires:  mate-common
  BuildRequires:  python-devel
@@@ -54,17 -46,11 +45,14 @@@ Development files for mate-menu
  
  %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
 +# fix for usage of multimedia-menus, games-menu and wine-menu packages
  sed -i -e '/<!-- End Other -->/ a\  <MergeFile>applications-merged/multimedia-categories.menu</MergeFile>' layout/mate-applications.menu
 +sed -i -e '/<MergeFile>applications-merged\/multimedia-categories.menu<\/MergeFile>/ a\  <MergeFile>applications-merged/games-categories.menu</MergeFile>' layout/mate-applications.menu
 +sed -i -e '/<MergeFile>applications-merged\/games-categories.menu<\/MergeFile>/ a\  <MergeFile>applications-merged/wine.menu</MergeFile>' layout/mate-applications.menu
  
 +NOCONFIGURE=1 ./autogen.sh
  
  
  %build
@@@ -110,14 -101,23 +98,27 @@@ find %{buildroot} -name '*.a' -exec rm 
  
  
  %changelog
- * Sun Jun 22 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-7
++* Sun Jun 22 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-3
 +- final fix for games-menu
 +- try fix wine-menu
 +
- * 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 Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Wed Mar 05 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.8.0-1
+ - Update to 1.8.0
+ 
+ * Sun Feb 16 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.90-1
+ - update to 1.7.90 release
+ 
+ * Mon Jan 20 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> 1.7.1-1
+ - update to 1.7.1 release
+ - add missing changelog entry from previous build
+ - add --with-gnome --all-name for find language
+ - use modern 'make install' macro
+ 
+ * Fri Dec 06 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-1
+ - update to 1.7.0 release
  
  * 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