Merge branch 'master' into school-master

6f25ef30 · Anton V. Boyarshinov · 0c3dfcac · 65b4ded0 · 6f25ef30
Commit 6f25ef30 authored Aug 14, 2009 by Anton V. Boyarshinov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

branding.spec branding.spec +3 -2

No files found.
--- a/branding.spec
+++ b/branding.spec
@@ -250,8 +250,8 @@ mkdir -p %buildroot%_sysconfdir/skel/Desktop
 cp -a Desktop/* %buildroot%_sysconfdir/skel/Desktop/
 mkdir -p %buildroot%_sysconfdir/skel/.kde4
 cp -a kde4/* %buildroot%_sysconfdir/skel/.kde4/
-mkdir -p %buildroot%_sysconfdir/kde4/xdg/menus/
-install -m 644 kde4-settings/menu/* %buildroot%_sysconfdir/kde4/xdg/menus/
+mkdir -p %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
+install -m 644 kde4-settings/menu/* %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
 popd

 #kde3-settings
@@ -395,6 +395,7 @@ echo $lang > lang
 %files kde4-settings
 %_sysconfdir/skel/Desktop
 %_sysconfdir/skel/.kde4
+%_sysconfdir/kde4/xdg/menus/applications-merged/*

 %files kde3-settings
 %_sysconfdir/skel/Desktop