casdc/branding
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Mikhail Efremov 2013-07-19 15:41:29 +04:00
parent ee289b17f4
commit d5ac5c33bd
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
branding.spec
View File

@ -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

5
menu/50-slinux-menu-style.menu
View File

@ -1,5 +0,0 @@
<!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>

5
menu/50-xfce-applications.menu
View File

@ -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>