5.0.2-alt1

branding.spec

 %define theme junior
-%define codename none
+%define codename p5
 %define brand school
 %define Brand ALT Linux 
 
 Name: branding-%brand-%theme
-Version: 5.0.1
+Version: 5.0.2
 Release: alt1
 BuildArch: noarch
 
@@ -45,7 +45,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
@@ -64,7 +65,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 
@@ -98,9 +98,7 @@ This package contains some graphics for ALT design.
 %package release
 
 Summary: %distribution %Theme release file
-Copyright: GPL
 Group: System/Configuration/Other
-Packager: Anton V. Boyarshinov <boyarsh@altlinux.org>
 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
 Conflicts: %conflicts_list
@@ -194,7 +192,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
@@ -294,6 +295,11 @@ echo $lang > lang
 %_desktopdir/*
 
 %changelog
+* Fri Dec 03 2010 Andrey Cherepanov <cas@altlinux.org> 5.0.2-alt1
+- prepare for 5.0.2 release
+- proper release generation
+- remove external JS loading in indexhtml
+
 * Wed Mar 03 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.1-alt1
 - OO.o desktop files names changed
 

indexhtml/index-en.html.in

@@ -34,7 +34,6 @@
 <input type="submit" name="sa" value="Поиск" id="button" />
 <!--/td></tr></tbody></table-->
 </form>
-<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_014412136813254060649%3Am2__wfh9ajy"></script>
 <!-- Google CSE Search Box Ends -->
 
 <div id="team">
@@ -73,7 +72,7 @@
 </div>
 </div>
 
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2009. All rights reserved.<br />
+<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2010. All rights reserved.<br />
 Address: 5th Donskoy proezd, 15/6, Moscow<br />
 Phone/Fax: +7 (495) 662-3883</p>
 </div>

indexhtml/index-ru.html.in

@@ -34,7 +34,6 @@
 <input type="submit" name="sa" value="Поиск" id="button" />
 <!--/td></tr></tbody></table-->
 </form>
-<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_014412136813254060649%3Am2__wfh9ajy"></script>
 <!-- Google CSE Search Box Ends -->
 </div>
 
@@ -81,7 +80,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>
 </div>

indexhtml/index-uk.html.in

@@ -34,7 +34,6 @@
 <input type="submit" name="sa" value="Пошук" id="button" />
 <!--/td></tr></tbody></table-->
 </form>
-<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_014412136813254060649%3Am2__wfh9ajy"></script>
 <!-- Google CSE Search Box Ends -->
 
 <div id="team">
@@ -75,7 +74,7 @@
 </div>
 </div>
 
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2009. Усі права застережено.<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>
 </div>

indexhtml/indexhtml.desktop.in

@@ -4,8 +4,8 @@ Type=Application
 Exec=url_handler.sh file:///usr/share/doc/indexhtml/index.html
 StartupNotify=false
 Icon=altlinux
-Name=@BRAND_FNAME@ @VERSION@ @NAME@: start page
+Name=Information about distribution
 Categories=System;Documentation;
 
 # Translations
-Name[ru]=@BRAND_FNAME@ @VERSION@ @NAME@: cтартовая страница
+Name[ru]=Сведения о дистрибутиве

notes/index-en.html.in

@@ -74,7 +74,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

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