Commit f4bd3296 authored by Anton V. Boyarshinov's avatar Anton V. Boyarshinov

Merge branch 'master' into alt-desktop

parents 16c4896f 1aa3b688
......@@ -334,7 +334,10 @@ install -m 644 themes/ALTLinux/gtk-2.0/* '%buildroot/usr/share/themes/ALTLinux-%
install -m 644 themes/ALTLinux/*.png '%buildroot/usr/share/themes/ALTLinux-%Theme/'
mkdir -p %buildroot/%_bindir
install -m 644 bin/* %buildroot/%_bindir
install -m 755 bin/* %buildroot/%_bindir
mkdir -p %buildroot/etc/sysconfig/
install -m 644 xinitrc %buildroot/etc/sysconfig/xinitrc.xfce
popd
#bootloader
......@@ -372,6 +375,8 @@ echo $lang > lang
[ "`readlink %_sysconfdir/bootsplash/themes/current`" != %theme ] ||
%__rm -f %_sysconfdir/bootsplash/themes/current
%post xfce-settings
cat /etc/sysconfig/xinitrc.xfce >> /etc/sysconfig/xinitrc
%files alterator
%config %_altdir/*.rcc
......@@ -426,6 +431,7 @@ echo $lang > lang
/etc/skel/.local
/usr/share/themes/*
/usr/share/xfce4/backdrops
/etc/sysconfig/xinitrc.xfce
%_bindir/*
......
......@@ -58,5 +58,6 @@ AC_CONFIG_FILES([
gnome-settings/metacity-theme-1.xml
components/ahttpd/styles/alterator.css
kde3-styles-splash/Theme.rc
xfce-settings/xinitrc
])
AC_OUTPUT
......@@ -25,7 +25,7 @@
<item name="pager" id="11888131361"/>
<item name="tasklist" id="11888145122"/>
<item name="xkb-plugin" id="11896827708"/>
<item name="xfce4-mixer" id="11888134323"/>
<item name="xfce4-mixer-plugin" id="11888134323"/>
<item name="systray" id="11888132202"/>
<item name="clock" id="14"/>
</items>
......
[mixer-plugin]
Device=default
LauncherCommand=xfce4-mixer
LauncherRunInTerminal=false
LauncherUseStartupNotification=false
XSETROOT='xsetroot -solid #@MIDDLE_COLOR_HEX@'
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