Skip to content

B
branding-etersoft-ximper
Commit d5ac5c33 authored by Mikhail Efremov's avatar Mikhail Efremov
Browse files
Options

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.
parent ee289b17
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 13 deletions
branding.spec
View file @ d5ac5c33
...@@ -321,8 +321,6 @@ install components/indexhtml/images/* %buildroot%_defaultdocdir/indexhtml/images ...@@ -321,8 +321,6 @@ install components/indexhtml/images/* %buildroot%_defaultdocdir/indexhtml/images
#menu #menu
mkdir -p %buildroot/usr/share/slinux-style/applications mkdir -p %buildroot/usr/share/slinux-style/applications
install menu/applications/* %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 mkdir -p %buildroot/etc/xdg/menus/xfce-applications-merged
cp menu/50-xfce-applications.menu %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 mkdir -p %buildroot/usr/share/desktop-directories
...@@ -429,7 +427,6 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf ...@@ -429,7 +427,6 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
%files menu %files menu
/usr/share/slinux-style /usr/share/slinux-style
/etc/xdg/menus/applications-merged/50-slinux-menu-style.menu
/etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu /etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu
/usr/share/desktop-directories/altlinux-wine.directory /usr/share/desktop-directories/altlinux-wine.directory
......
menu/50-slinux-menu-style.menu deleted 100644 → 0
View file @ ee289b17
<!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
menu/50-xfce-applications.menu
View file @ d5ac5c33
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<Menu> <Menu>
<Name>Xfce</Name> <Name>Xfce</Name>
<AppDir>/usr/share/slinux-style/applications</AppDir>
<Menu> <Menu>
<Name>ShallowSettings</Name> <Name>ShallowSettings</Name>
...@@ -41,9 +42,6 @@ ...@@ -41,9 +42,6 @@
</Menu> </Menu>
</Menu> </Menu>
<MergeFile>altlinux-applications.menu</MergeFile>
<MergeDir>applications-merged</MergeDir>
<Layout> <Layout>
<Filename>xfce4-run.desktop</Filename> <Filename>xfce4-run.desktop</Filename>
<Filename>xfce4-appfinder.desktop</Filename> <Filename>xfce4-appfinder.desktop</Filename>
...@@ -151,7 +149,6 @@ ...@@ -151,7 +149,6 @@
<Category>X-Xfce-Toplevel</Category> <Category>X-Xfce-Toplevel</Category>
</Include> </Include>
<MergeDir>xfce-applications-merged</MergeDir>
<MergeFile>applications-menueditor.menu</MergeFile> <MergeFile>applications-menueditor.menu</MergeFile>
<MergeFile>xfce-applications-menueditor.menu</MergeFile> <MergeFile>xfce-applications-menueditor.menu</MergeFile>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment