5.0.0-alt18

branding.spec

-%define theme master
+%define theme lite
 %define codename none
 %define brand school
 %define Brand %nil
@@ -67,9 +67,9 @@ Packager: Anton V. Boyarshiniv <boyarsh@altlinux.org>
 Provides: design-alterator-browser-%theme  branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
 Provides: alterator-icons design-alterator design-alterator-%theme
 Obsoletes:  branding-alt-%theme-browser-qt  branding-altlinux-%theme-browser-qt 
-
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-browser-qt ";done )
 Obsoletes: design-alterator-server design-alterator-desktop design-altertor-browser-desktop  design-altertor-browser-server 
+Obsoletes: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-browser-qt ";done )
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-alterator ";done )
 PreReq(post,preun): alternatives >= 0.2 alterator
 
 %description alterator
@@ -122,7 +122,7 @@ Distribution license and release notes
 
 Summary: XFCE settings for %Brand %version %Theme
 License: Distributable
-Group: Graphical desktop
+Group: Graphical desktop/XFce
 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 )
@@ -242,11 +242,11 @@ 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/'
+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
+install -m 755 bin/* %buildroot/%_bindir
 popd
 
 #bootloader

xfce-settings/etcskel/.config/xfce4/panel/launcher-11888137035.rc

@@ -3,12 +3,12 @@ Name=Текстовый процессор
 Exec=xfce4-wordprocessor
 Terminal=false
 StartupNotify=false
-Icon=/usr/share/icons/default/32x32/mimetypes/x-office-document.png
+Icon=/usr/share/icons/Tango/32x32/mimetypes/x-office-document.png
 
 [Entry 1]
 Name=Электронные таблицы
 Exec=xfce4-spreadsheet
 Terminal=false
 StartupNotify=false
-Icon=/usr/share/icons/default/32x32/mimetypes/x-office-spreadsheet.png
+Icon=/usr/share/icons/Tango/32x32/mimetypes/x-office-spreadsheet.png