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

[Wolfgang Ulbrich]

commit 55b3d86f685918bb42b1c698a82cfa629034c77f
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sun Jun 22 20:18:29 2014 +0200

    fix games-menu

 mate-menus.spec |   59 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 31 insertions(+), 28 deletions(-)
---
diff --git a/mate-menus.spec b/mate-menus.spec
index cfc0d62..52072c4 100644
--- a/mate-menus.spec
+++ b/mate-menus.spec
@@ -1,18 +1,26 @@
 Name:           mate-menus
-Version:        1.8.0
-Release:        1%{?dist}
+Version:        1.6.0
+Release:        7%{?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
 
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
 
 # we don't want to provide private python extension libs
 %{?filter_setup:
@@ -46,11 +54,17 @@ 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
+# 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
@@ -63,20 +77,15 @@ make %{?_smp_mflags} V=1
 
 
 %install
-%{make_install}
-
+make install DESTDIR=%{buildroot}
 install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/menus
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 find %{buildroot} -name '*.a' -exec rm -f {} ';'
-chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/matemenu.so
-
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name}
 
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
 
-
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
 %config %{_sysconfdir}/xdg/menus/mate-applications.menu
@@ -101,20 +110,14 @@ chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/matemenu.so
 
 
 %changelog
-* 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
+* Sun Jun 22 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-7
+- 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 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