Commit 6f25ef30 authored by Anton V. Boyarshinov's avatar Anton V. Boyarshinov

Merge branch 'master' into school-master

parents 0c3dfcac 65b4ded0
...@@ -250,8 +250,8 @@ mkdir -p %buildroot%_sysconfdir/skel/Desktop ...@@ -250,8 +250,8 @@ mkdir -p %buildroot%_sysconfdir/skel/Desktop
cp -a Desktop/* %buildroot%_sysconfdir/skel/Desktop/ cp -a Desktop/* %buildroot%_sysconfdir/skel/Desktop/
mkdir -p %buildroot%_sysconfdir/skel/.kde4 mkdir -p %buildroot%_sysconfdir/skel/.kde4
cp -a kde4/* %buildroot%_sysconfdir/skel/.kde4/ cp -a kde4/* %buildroot%_sysconfdir/skel/.kde4/
mkdir -p %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/ install -m 644 kde4-settings/menu/* %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
popd popd
#kde3-settings #kde3-settings
...@@ -395,6 +395,7 @@ echo $lang > lang ...@@ -395,6 +395,7 @@ echo $lang > lang
%files kde4-settings %files kde4-settings
%_sysconfdir/skel/Desktop %_sysconfdir/skel/Desktop
%_sysconfdir/skel/.kde4 %_sysconfdir/skel/.kde4
%_sysconfdir/kde4/xdg/menus/applications-merged/*
%files kde3-settings %files kde3-settings
%_sysconfdir/skel/Desktop %_sysconfdir/skel/Desktop
......
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