5.0.2-alt1

branding.spec

 %define theme school-server
 %define Theme School Server
-%define codename none
+%define codename p5 
 %define brand altlinux
 %define Brand ALT Linux
 %define status %nil 
@@ -8,7 +8,7 @@
 
 
 Name: branding-%brand-%theme
-Version: 5.0.1
+Version: 5.0.2
 Release: alt1
 
 BuildArch: noarch
@@ -47,7 +47,8 @@ Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme desig
 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootloader ";done )
 
 %description bootloader
-Here you find the graphical boot logo. Suitable for both lilo and syslinux.
+Here you find the graphical boot logo. Suitable for both lilo
+and syslinux.
 
 %package bootsplash
 Summary: Theme for splash animations during bootup
@@ -66,7 +67,6 @@ This package contains graphics for boot process
 Summary: Design for alterator for %Brand %Theme 
 License: GPL
 Group: System/Configuration/Other
-Packager: Anton V. Boyarshinov <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 
@@ -76,7 +76,7 @@ Obsoletes: design-alterator-server design-alterator-desktop design-altertor-brow
 PreReq(post,preun): alternatives >= 0.2 alterator
 
 %description alterator
-Design for QT and web alterator for %Brand %Theme 
+Design for QT and web alterator for %Brand %Theme
 
 %package graphics
 Summary: design for ALT
@@ -98,7 +98,6 @@ This package contains some graphics for ALT design.
 %package release
 
 Summary: %distribution %Theme release file
-Copyright: GPL
 Group: System/Configuration/Other
 Provides: %(for n in %provide_list; do echo -n "$n-release = %version-%release "; done) altlinux-release-%theme  branding-alt-%theme-release
 Obsoletes: %obsolete_list  branding-alt-%theme-release
@@ -183,7 +182,10 @@ __EOF__
 
 #release
 install -pD -m644 /dev/null %buildroot%_sysconfdir/buildreqs/packages/ignore.d/%name-release
-echo "%distribution %version %Theme %status_en (%codename)" >%buildroot%_sysconfdir/altlinux-release
+echo -n "%distribution %version %Theme" >%buildroot%_sysconfdir/altlinux-release
+test -n "%status_en" && echo -n " %status_en" >>%buildroot%_sysconfdir/altlinux-release
+test -n "%codename"  && echo -n " (%codename)" >>%buildroot%_sysconfdir/altlinux-release
+echo >>%buildroot%_sysconfdir/altlinux-release
 for n in fedora redhat system; do
 	ln -s altlinux-release %buildroot%_sysconfdir/$n-release
 done
@@ -265,6 +267,11 @@ echo $lang > lang
 %_desktopdir/indexhtml.desktop
 
 %changelog
+* Fri Nov 26 2010 Andrey Cherepanov <cas@altlinux.org> 5.0.2-alt1
+- prepare for 5.0.2 release
+- proper release generation
+- fix Rissian distro name in license and other places
+
 * Wed Mar 03 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.1-alt1
 - version change for release
 

notes/index-en.html.in

@@ -72,7 +72,7 @@
 
 </div>
 
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr> &copy; ALT Linux, 2008. All rights reserved.<br />
+<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr> &copy; ALT Linux, 2010. All rights reserved.<br />
   Address: 5th Donskoy proezd, 15/6, Moscow<br />
   Phone/Fax: +7 (495) 662-3883
 </p>

notes/index-ru.html.in

@@ -72,7 +72,7 @@
   
 </div>
 
-<p class="footer"><nobr>Альт Линукс 5.0 Школьный Сервер</nobr> &copy; ALT Linux, 2009. Все права защищены.<br />
+<p class="footer"><nobr>Альт Линукс 5.0 Школьный Сервер</nobr> &copy; ALT Linux, 2010. Все права защищены.<br />
    Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 6<br />
    Телефон/факс: +7 (495) 662-3883
 </p>

notes/index-uk.html.in

@@ -55,8 +55,8 @@
 
 </div>
 
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2008. Усі права застережено.<br />
-   Адреса: м. Москва, 5-й Донський проїзд, 15, буд. 11<br />
+<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2010. Усі права застережено.<br />
+   Адреса: м. Москва, 5-й Донський проїзд, 15, буд. 6<br />
    Телефон/факс: +7 (495) 662-3883
 </p>
 

notes/license.ru.html.in

@@ -6,13 +6,13 @@
 <body>
 
 <h1>Лицензионный договор</h1>
-<h2>на программное обеспечение @BRAND_FNAME@ @VERSION@ @NAME@ и включенные в него программы для ЭВМ</h2>
+<h2>на программное обеспечение Альт Линукс 5.0 Школьный Сервер и включенные в него программы для ЭВМ</h2>
 
 <p><b>1. Сведения о договоре</b></p>
 <p>1.1 Участники договора</p>
 
 <p>Настоящий лицензионный договор заключается между ООО «Альт Линукс», обладателем прав на программное обеспечение 
-<strong>@BRAND_FNAME@ @VERSION@ @NAME@</strong> 
+<strong>Альт Линукс 5.0 Школьный Сервер</strong> 
 (далее - ДИСТРИБУТИВ), и Вами, владельцем экземпляра ДИСТРИБУТИВА.</p>
 
 <p>1.2 Предмет договора</p>

notes/release-notes.all.html.in

@@ -5,13 +5,13 @@
 	<TITLE></TITLE>
 </HEAD>
 <BODY>
-    <H2>Thank you for choosing ALT Linux 5.0 School: Server!</H2>
+    <H2>Thank you for choosing ALT Linux 5.0 School Server!</H2>
     <p>
     For security reasons server has no graphical interface, but it could be configured from any other computer from same local network.
     Find out server IP-address. List of IP-addresses for server configuration could be found on server screen.
     Open browser and go to that address.
     </p>
-    <h3>Examoles of IP-addresses (SERVER):<br>
+    <h3>Examples of IP-addresses (SERVER):<br>
     192.168.0.1<br>
     10.1.0.2</h3>
     <p>