diff --git a/branding.spec b/branding.spec index ca6b8b6..17ed0e6 100644 --- a/branding.spec +++ b/branding.spec @@ -1,10 +1,10 @@ %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 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 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 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 5.0.1-alt1 - OO.o desktop files names changed diff --git a/indexhtml/index-en.html.in b/indexhtml/index-en.html.in index 048c460..310b1d9 100644 --- a/indexhtml/index-en.html.in +++ b/indexhtml/index-en.html.in @@ -34,7 +34,6 @@ -
@@ -73,7 +72,7 @@
-

@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@ © ALT Linux, 2009. All rights reserved.
+

@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@ © ALT Linux, 2010. All rights reserved.
Address: 5th Donskoy proezd, 15/6, Moscow
Phone/Fax: +7 (495) 662-3883

diff --git a/indexhtml/index-ru.html.in b/indexhtml/index-ru.html.in index 93160d4..871cc5b 100644 --- a/indexhtml/index-ru.html.in +++ b/indexhtml/index-ru.html.in @@ -34,7 +34,6 @@ - @@ -81,7 +80,7 @@ -

Альт Линукс 5.0 Школьный Юниор © ALT Linux, 2009. Все права защищены.
+

Альт Линукс 5.0 Школьный Юниор © ALT Linux, 2010. Все права защищены.
Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 6
Телефон/факс: +7 (495) 662-3883

diff --git a/indexhtml/index-uk.html.in b/indexhtml/index-uk.html.in index 1fa8c0c..e3da189 100644 --- a/indexhtml/index-uk.html.in +++ b/indexhtml/index-uk.html.in @@ -34,7 +34,6 @@ -
@@ -75,7 +74,7 @@
-

@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@ © ALT Linux, 2009. Усі права застережено.
+

@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@ © ALT Linux, 2010. Усі права застережено.
Адреса: м. Москва, 5-й Донський проїзд, 15, буд. 6
Телефон/факс: +7 (495) 662-3883

diff --git a/indexhtml/indexhtml.desktop.in b/indexhtml/indexhtml.desktop.in index a9f1ecd..b4f5e70 100644 --- a/indexhtml/indexhtml.desktop.in +++ b/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]=Сведения о дистрибутиве diff --git a/notes/index-en.html.in b/notes/index-en.html.in index 2854c60..0052a50 100644 --- a/notes/index-en.html.in +++ b/notes/index-en.html.in @@ -74,7 +74,7 @@ -

@BRAND_FNAME@ @VERSION@ @NAME@ © ALT Linux, 2008. All rights reserved.
+

@BRAND_FNAME@ @VERSION@ @NAME@ © ALT Linux, 2010. All rights reserved.
Address: 5th Donskoy proezd, 15/6, Moscow
Phone/Fax: +7 (495) 662-3883

diff --git a/notes/index-ru.html.in b/notes/index-ru.html.in index 6858138..5626948 100644 --- a/notes/index-ru.html.in +++ b/notes/index-ru.html.in @@ -74,7 +74,7 @@ -

@BRAND_FNAME@ @VERSION@ @NAME@ © ALT Linux, 2009. Все права защищены.
+

@BRAND_FNAME@ @VERSION@ @NAME@ © ALT Linux, 2010. Все права защищены.
Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 6
Телефон/факс: +7 (495) 662-3883