diff --git a/branding.spec b/branding.spec index 689709f..2851a63 100644 --- a/branding.spec +++ b/branding.spec @@ -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/* diff --git a/configure.ac b/configure.ac index f64b540..d656bc7 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/kde4-settings/kde4/share/config/default-apps b/kde4-settings/kde4/share/config/default-apps index e4ac89e..3af7aff 100644 --- a/kde4-settings/kde4/share/config/default-apps +++ b/kde4-settings/kde4/share/config/default-apps @@ -1,2 +1,3 @@ firefox oowriter +kde4-dolphin diff --git a/xfce-settings/etcskel/.config/xfce4/panel/panels.xml b/xfce-settings/etcskel/.config/xfce4/panel/panels.xml index 0a9d652..5131c5d 100644 --- a/xfce-settings/etcskel/.config/xfce4/panel/panels.xml +++ b/xfce-settings/etcskel/.config/xfce4/panel/panels.xml @@ -25,7 +25,7 @@ - + diff --git a/xfce-settings/etcskel/.config/xfce4/panel/xfce4-mixer-11888134323.rc b/xfce-settings/etcskel/.config/xfce4/panel/xfce4-mixer-11888134323.rc deleted file mode 100644 index bed1a0f..0000000 --- a/xfce-settings/etcskel/.config/xfce4/panel/xfce4-mixer-11888134323.rc +++ /dev/null @@ -1,6 +0,0 @@ -[mixer-plugin] -Device=default -LauncherCommand=xfce4-mixer -LauncherRunInTerminal=false -LauncherUseStartupNotification=false - diff --git a/xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-11896827708.rc b/xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-11896827708.rc deleted file mode 100644 index e1a5c3c..0000000 --- a/xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-11896827708.rc +++ /dev/null @@ -1,4 +0,0 @@ -display_type=0 -per_app_layout=1 -default_group=0 - diff --git a/xfce-settings/xinitrc.in b/xfce-settings/xinitrc.in new file mode 100644 index 0000000..96999e6 --- /dev/null +++ b/xfce-settings/xinitrc.in @@ -0,0 +1 @@ +XSETROOT='xsetroot -solid #@MIDDLE_COLOR_HEX@'