menu: Use 'xfce-applications-merged' directory only.

Place whole menu as single menu-file in the xfce-applications-merged/ directory. Don't use applications-merged: it is broken in the altlinux-freedesktop-menu-0.65-alt1. See ALT bug #29129 for details.

menu: Use 'xfce-applications-merged' directory only.
d5ac5c33 · Mikhail Efremov · ee289b17 · d5ac5c33 · ee289b17 · d5ac5c33
Commit d5ac5c33 authored Jul 19, 2013 by Mikhail Efremov
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 13 deletions

branding.spec branding.spec +0 -3

50-slinux-menu-style.menu menu/50-slinux-menu-style.menu +0 -6

50-xfce-applications.menu menu/50-xfce-applications.menu +1 -4

No files found.
--- a/branding.spec
+++ b/branding.spec
@@ -321,8 +321,6 @@ install components/indexhtml/images/* %buildroot%_defaultdocdir/indexhtml/images
 #menu
 mkdir -p %buildroot/usr/share/slinux-style/applications
 install menu/applications/* %buildroot/usr/share/slinux-style/applications/
-mkdir -p %buildroot/etc/xdg/menus/applications-merged
-cp menu/50-slinux-menu-style.menu %buildroot/etc/xdg/menus/applications-merged/
 mkdir -p %buildroot/etc/xdg/menus/xfce-applications-merged
 cp menu/50-xfce-applications.menu %buildroot/etc/xdg/menus/xfce-applications-merged/
 mkdir -p %buildroot/usr/share/desktop-directories
@@ -429,7 +427,6 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf

 %files menu
 /usr/share/slinux-style
-/etc/xdg/menus/applications-merged/50-slinux-menu-style.menu
 /etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu
 /usr/share/desktop-directories/altlinux-wine.directory


--- a/menu/50-slinux-menu-style.menu
+++ b/menu/50-slinux-menu-style.menu
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-            "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
-<Menu>
-<AppDir>/usr/share/slinux-style/applications</AppDir>
-</Menu>
\ No newline at end of file
--- a/menu/50-xfce-applications.menu
+++ b/menu/50-xfce-applications.menu
@@ -3,6 +3,7 @@

 <Menu>
    <Name>Xfce</Name>
+    <AppDir>/usr/share/slinux-style/applications</AppDir>

    <Menu>
        <Name>ShallowSettings</Name>
@@ -41,9 +42,6 @@
        </Menu>
    </Menu>

-    <MergeFile>altlinux-applications.menu</MergeFile>
-    <MergeDir>applications-merged</MergeDir>
-
    <Layout>
        <Filename>xfce4-run.desktop</Filename>
        <Filename>xfce4-appfinder.desktop</Filename>
@@ -151,7 +149,6 @@
        <Category>X-Xfce-Toplevel</Category>
    </Include>

-    <MergeDir>xfce-applications-merged</MergeDir>
    <MergeFile>applications-menueditor.menu</MergeFile>
    <MergeFile>xfce-applications-menueditor.menu</MergeFile>