xfce settings removed from spec

Makefile.in

@@ -6,6 +6,7 @@ VERSION=@VERSION@
 all:
 # background
 #	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' wallpaper.png
+	convert images/wallpaper.png wallpaper.png
 	cp -al wallpaper.png graphics/backgrounds/default.png
 	cp -al wallpaper.png graphics/backgrounds/xdm.png
 	convert wallpaper.png kde3-styles-splash/Background.jpg

branding.spec

@@ -9,7 +9,7 @@
 
 Name: branding-%brand-%theme
 Version: 5.0.0
-Release: alt33
+Release: alt34
 
 BuildArch: noarch
 
@@ -196,40 +196,6 @@ popd
 mkdir -p %buildroot/usr/share/install2/slideshow
 install slideshow/*  %buildroot/usr/share/install2/slideshow/
 
-#xfce-settings
-pushd xfce-settings
-mkdir -p %buildroot/etc/skel/.config/xfce4/desktop
-mkdir -p %buildroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
-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/xfconf/xfce-perchannel-xml/* %buildroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
-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 ../graphics/backgrounds/default.png %buildroot/usr/share/xfce4/backdrops
-install -m 644 ../graphics/backgrounds/xdm.png %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 755 bin/* %buildroot/%_bindir
-
-mkdir -p %buildroot/etc/sysconfig/ 
-install -m 644 xinitrc %buildroot/etc/sysconfig/xinitrc.xfce
-popd
-
 #bootloader
 %pre bootloader
 [ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
@@ -298,6 +264,10 @@ echo $lang > lang
 %_desktopdir/indexhtml.desktop
 
 %changelog
+* Tue Oct 20 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt34
+- merge with office-server branding
+- no STATUS
+
 * Tue Oct 13 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt33
 - colors of inactive buttons fixed
 - color of progress bar in bootloader fixed