Rename School Server branding to School Master

branding.spec

 %define theme server
-%define Theme School Server
+%define Theme School Master
 %define codename none
 %define brand school
 %define Brand ALT Linux
@@ -7,7 +7,7 @@
 
 Name: branding-%brand-%theme
 Version: 6.0.0 
-Release: alt3
+Release: alt1
 
 BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-droid
 BuildRequires: design-bootloader-source >= 5.0-alt2
@@ -23,8 +23,9 @@ BuildRequires: ImageMagick fontconfig bc libGConf-devel
 
 %define status %nil
 %define status_en %nil
-%define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-desktop altlinux-gnome-desktop
+%define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-school-server altlinux-desktop altlinux-gnome-desktop
 
+Packager: Andrey Cherepanov <cas@altlinux.org>
 
 Source: branding.tar
 
@@ -420,277 +421,6 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \
 %_desktopdir/indexhtml.desktop
 
 %changelog
-* Fri Apr 06 2012 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt3
-- images with informika logo added
+* Sat May 05 2012 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt1
+- Build for ALT Linux 6.0 School Master
 
-* Thu Apr 05 2012 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt2
-- Adapt indexhtml to use from httpd2
-- Add gksu for apt-indicator in GNOME
-
-* Thu Nov 10 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt1
-- school server branding on top of centaurus one
-
-* Fri Sep 30 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt18
-- theme-livecd.qrc for livecd
-
-* Mon Sep 19 2011 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt17
-- New design of indexhtml
-
-* Fri Sep 09 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt16
-- gtk theme fix from mex3@
-
-* Tue Aug 23 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt15
-- tooltip color in browser-qt really fixed
-
-* Mon Aug 22 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt14
-- indexhtml design and links fixed
-- tooltip color in browser-qt fixed
-
-* Wed Aug 10 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt13
-- yet another slide added
-
-* Fri Jul 01 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt12.1
-- rebuild with design-bootloader-source 6.0
-
-* Wed Jun 15 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt12
-- Style=Cleanlooks in alterator
-
-* Fri Jun 10 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt11
-- images with p6 logo
-
-* Mon Jun 06 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt10
-- automatic 800x600 for virtualbox
-
-* Thu May 26 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt9
-- setup default gnome panel
-- .gconf deleted from etcskel
-
-* Mon May 23 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt8
-- dependence on altlinux-menus dropped
-
-* Sat May 07 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt7
-- beta status deleted
-- rebuild with design-bootloader-source 5.9-alt4
-
-* Wed Apr 27 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt6
-- settings menu translation fixed
-
-* Tue Apr 26 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt5
-- arm buildabulity
-- gnome menus customization
-
-* Mon Feb 21 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt4
-- indexhtml colors changed (mex3)
-
-* Thu Feb 10 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt3
-- fixed logo in web interface
-- boot colors changed
-
-* Thu Feb 03 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt2
-- install menu position changed
-- web design from mex3@
-
-* Fri Jan 28 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt1
-- production slideshow
-- installer wallpaper changed
-- grub theme
-
-* Wed Dec 15 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt11
-- fvwm settings added
-
-* Thu Nov 18 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt10
-- gfxboot colors changed
-
-* Tue Nov 16 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt9
-- plymouth: scaling for non 4:3 or 16:9 resolutions fixed
-
-* Sat Nov 13 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt8
-- typo in plymouth script fixed
-
-* Fri Nov 12 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt7
-- migration from bootsplash to plymouth
-
-* Fri Oct 22 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt6
-- menu bar size fixed
-
-* Wed Sep 15 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt5
-- setup grub colors added
-
-* Tue Aug 31 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt4
-- status changed to beta
-- background changed
-
-* Mon Aug 02 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt3
-- fonts changed
-
-* Tue May 25 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt2.2
-- rebuld with design-bootloader-source 5.9
-
-* Fri May 21 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt2.1
-- rebuild with gfxboot.git-4.1.47
-
-* Tue Apr 06 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt2
-- product-logo.png changed
-
-* Thu Mar 04 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt1
-- Centaurus branding
-
-* Wed Mar 03 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.1-alt1
-- OO.o desktop files names changed
-
-* Mon Oct 26 2009 Andrey Cherepanov <cas@altlinux.org> 5.0.0-alt22
-- provide design-graphics and gnome-session-splash to avoid wrong 
-  graphics package installation
-
-* Thu Oct 22 2009 Andrey Cherepanov <cas@altlinux.org> 5.0.0-alt21
-- fix Russian name and copyright years
-- fix images
-- remove beta status
-
-* Mon Sep 07 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt20
-- beep on boot disabled
-
-* Thu Aug 13 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt19
-- production images, slides (and colors?)
-
-* Sun Jul 12 2009 Alexey Rusakov <ktirf@altlinux.org> 5.0.0-alt18.1.1
-- fix unexpanded autoconf substitute (closes bug 20757)
-- beautify theme names in -gnome-settings
-
-* Thu Jun 25 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt18.1
-- titles removed from wallpater and installer 
-
-* Wed Jun 24 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt18
-- sources restructure 
->>>>>>> school-server/sisyphus
-
-* Thu Jun 11 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt17
-- merge with desktop
-
-* Wed May 13 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt16
-- \%setup fixed from boyarsh@
-- remove package name from .gear-rules from boyarsh@
-
-* Fri Apr 24 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt15
-- minor fixes of strange merge
-- changes in alterator.css.in from inger@
-
-* Fri Apr 17 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt14
-- better quality background image for installer
-
-* Thu Apr 16 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt13
-- alterator.css = alterator.css+menu.css
-- some strange results of merge fixed
-
-* Fri Apr 10 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt12
-- gear-rules fixed
-
-* Fri Apr 10 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt11
-- web logo - white and smaller;
-  labels on buttons - darker;
-  disabled elements - lighter;
-
-* Fri Apr 10 2009 Alxandra Panyukova <mex3@altlinux.ru> 5.0.0-alt10
-- some misspells fixed
-
-* Thu Apr 09 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt9
-- darker text and new logo for web
-
-* Thu Apr 09 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt8
-- gradients and some colors in css fixed by mex3@
-
-* Tue Apr 07 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt7
-- fixes for installer design from mex3@ 
-
-* Fri Apr 03 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt6
-- default gray design from mex3@
-- \%status_en intorduces for release file 
-
-* Wed Apr 01 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt5
-- logo in www design fixed 
-
-* Tue Mar 31 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt4
-- www design fixed 
-
-* Tue Mar 31 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt3
-- conflicts for -alterator subpackages added
-- design for web alterator changed
-
-* Mon Mar 30 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt2
-- -browser-qt subpackage remaned to -alterator as it really is
-
-* Fri Mar 27 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt1
-- addes \%status to altlinux-release
-- images for verbose bootsplash mode from one source
-
-* Wed Mar 25 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt24
-- added versioned provides for indexhtml 
-
-* Tue Mar 24 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt23
-- indexhtml subpackage added 
-
-* Mon Mar 23 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt22
-- nepomukserverrc added into kde4 
-
-* Wed Mar 18 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt21
-- other images for browser-qt added
-- gtkrcs added into kde4-settings
-- plasma-applet-networkmanagenemt removed from kde4 by default
-- conflicts bitween different brandings added
-
-* Thu Mar 05 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt20
-- steps icons added 
-
-* Fri Feb 27 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt19
-- sample slideshow added
-
-* Wed Feb 25 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt18
-- 1024x768 removed :D
-- more transparent menu selection bar
-
-* Tue Feb 24 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt17
-- 1024x768 added 
-- fonts changed
-
-* Thu Feb 19 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt16
-- not setup language in bootloader during install (when it is 'C') 
-
-* Wed Feb 18 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt15
-- rebuild with new bootloader-source with support of real language change 
-
-* Tue Feb 17 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt14
-- auto set default language for bootloader from /etc/sysconfig/i18n 
-
-* Mon Feb 16 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt13
-- rebuild for fix oversized /boot/splash/message 
-
-* Fri Feb 13 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt12
-- default language set to ru_RU for system boot 
-
-* Wed Feb 11 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt11
-- fixed conflict of notes subpackage with itself 
-
-* Tue Feb 10 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt10
-- more kde4 settings from zerg@ 
-- alternative and obsoletes for graphics added
-
-* Thu Feb 05 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt9
-- rebuild with new translations 
-
-* Thu Feb 05 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt8
-- added kde4-settings subpackage 
-
-* Wed Feb 04 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt7
-- added conflicts for notes 
-
-* Mon Jan 26 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt6
-- xdm background fixed 
-
-* Fri Jan 23 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt5
-- added 'notes' subpackage 
-
-* Thu Jan 15 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt4
-- fixed problem with owerwritten alternative 
-
-* Wed Jan 14 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt3
-- release subpackage added