diff --git a/branding.spec b/branding.spec index af25d10..d5ad8d7 100644 --- a/branding.spec +++ b/branding.spec @@ -159,18 +159,6 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi %description gnome-settings GNOME settings for %Brand %version %Theme -%package xfce-settings - -Summary: XFCE settings for %Brand %version %Theme -License: Distributable -Group: Graphical desktop -Requires: PolicyKit-gnome -Obsoletes: xfce-settings-lite xfce-settings-school-lite -Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-xfce-settings ";done ) - -%description xfce-settings -XFCE settings for %Brand %version %Theme - %package slideshow @@ -305,36 +293,6 @@ touch %buildroot%_indexhtmldir/index.html install -m644 indexhtml.desktop %buildroot%_desktopdir/ popd -#xfce-settings -pushd xfce-settings -mkdir -p %buildroot/etc/skel/.config/xfce4/desktop -mkdir -p %buildroot/etc/skel/.config/xfce4/mcs_settings -mkdir -p %buildroot/etc/skel/.config/xfce4/panel -mkdir -p %buildroot/etc/skel/.config/xfce4-session -mkdir -p %buildroot/etc/skel/.config/autostart -mkdir -p %buildroot/etc/skel/.local/share/applications -mkdir -p %buildroot/etc/skel/Templates -install -m 644 etcskel/Templates/* %buildroot/etc/skel/Templates/ -install -m 644 etcskel/.config/xfce4/helpers.rc %buildroot/etc/skel/.config/xfce4/ -install -m 644 etcskel/.config/xfce4/desktop/* %buildroot/etc/skel/.config/xfce4/desktop -install -m 644 etcskel/.config/xfce4/mcs_settings/* %buildroot/etc/skel/.config/xfce4/mcs_settings -install -m 644 etcskel/.config/xfce4/panel/* %buildroot/etc/skel/.config/xfce4/panel -install -m 644 etcskel/.config/xfce4-session/* %buildroot/etc/skel/.config/xfce4-session/ -install -m 644 etcskel/.config/autostart/* %buildroot/etc/skel/.config/autostart -install -m 644 etcskel/.local/share/applications/* %buildroot/etc/skel/.local/share/applications -install -m 644 etcskel/.wm-select %buildroot/etc/skel/ -install -m 644 etcskel/.Xdefaults %buildroot/etc/skel/ - -mkdir -p %buildroot/usr/share/xfce4/backdrops -install -m 644 backgrounds/* %buildroot/usr/share/xfce4/backdrops -mkdir -p '%buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0' -install -m 644 themes/ALTLinux/gtk-2.0/* '%buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0/' -install -m 644 themes/ALTLinux/*.png '%buildroot/usr/share/themes/ALTLinux-%Theme/' - -mkdir -p %buildroot/%_bindir -install -m 644 bin/* %buildroot/%_bindir -popd - #bootloader %pre bootloader [ -s /boot/splash/%theme ] && rm -fr /boot/splash/%theme ||: @@ -418,19 +376,6 @@ echo $lang > lang %_indexhtmldir/* %_desktopdir/* -%files xfce-settings -/etc/skel/Templates -%exclude /etc/skel/Templates/* -/etc/skel/.wm-select -/etc/skel/.Xdefaults -/etc/skel/.config -/etc/skel/.config -/etc/skel/.local -/usr/share/themes/* -/usr/share/xfce4/backdrops -%_bindir/* - - %changelog * Thu Aug 13 2009 Anton V. Boyarshinov 5.0.0-alt19 - production images, slides (and colors?)