Skip to content

B
branding-etersoft-ximper
Commit df683736 authored by Andrey Cherepanov's avatar Andrey Cherepanov
Browse files
Options

5.0.2-alt1

- prepare for 5.0.2 release - proper release generation - fix Rissian distro name in license and other places
parent 2d7a70f3
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 14 deletions
branding.spec
View file @ df683736
%define theme school-server %define theme school-server
%define Theme School Server %define Theme School Server
%define codename none %define codename p5
%define brand altlinux %define brand altlinux
%define Brand ALT Linux %define Brand ALT Linux
%define status %nil %define status %nil
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Name: branding-%brand-%theme Name: branding-%brand-%theme
Version: 5.0.1 Version: 5.0.2
Release: alt1 Release: alt1
BuildArch: noarch BuildArch: noarch
...@@ -47,7 +47,8 @@ Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme desig ...@@ -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 ) Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootloader ";done )
%description bootloader %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 %package bootsplash
Summary: Theme for splash animations during bootup Summary: Theme for splash animations during bootup
...@@ -66,7 +67,6 @@ This package contains graphics for boot process ...@@ -66,7 +67,6 @@ This package contains graphics for boot process
Summary: Design for alterator for %Brand %Theme Summary: Design for alterator for %Brand %Theme
License: GPL License: GPL
Group: System/Configuration/Other 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: design-alterator-browser-%theme branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
Provides: alterator-icons design-alterator design-alterator-%theme Provides: alterator-icons design-alterator design-alterator-%theme
Obsoletes: branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt Obsoletes: branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
...@@ -98,7 +98,6 @@ This package contains some graphics for ALT design. ...@@ -98,7 +98,6 @@ This package contains some graphics for ALT design.
%package release %package release
Summary: %distribution %Theme release file Summary: %distribution %Theme release file
Copyright: GPL
Group: System/Configuration/Other 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 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 Obsoletes: %obsolete_list branding-alt-%theme-release
...@@ -183,7 +182,10 @@ __EOF__ ...@@ -183,7 +182,10 @@ __EOF__
#release #release
install -pD -m644 /dev/null %buildroot%_sysconfdir/buildreqs/packages/ignore.d/%name-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 for n in fedora redhat system; do
ln -s altlinux-release %buildroot%_sysconfdir/$n-release ln -s altlinux-release %buildroot%_sysconfdir/$n-release
done done
...@@ -265,6 +267,11 @@ echo $lang > lang ...@@ -265,6 +267,11 @@ echo $lang > lang
%_desktopdir/indexhtml.desktop %_desktopdir/indexhtml.desktop
%changelog %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 * Wed Mar 03 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.1-alt1
- version change for release - version change for release
......
notes/index-en.html.in
View file @ df683736
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</div> </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 /> Address: 5th Donskoy proezd, 15/6, Moscow<br />
Phone/Fax: +7 (495) 662-3883 Phone/Fax: +7 (495) 662-3883
</p> </p>
......
notes/index-ru.html.in
View file @ df683736
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</div> </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 /> Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 6<br />
Телефон/факс: +7 (495) 662-3883 Телефон/факс: +7 (495) 662-3883
</p> </p>
......
notes/index-uk.html.in
View file @ df683736
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
</div> </div>
<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2008. Усі права застережено.<br /> <p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2010. Усі права застережено.<br />
Адреса: м. Москва, 5-й Донський проїзд, 15, буд. 11<br /> Адреса: м. Москва, 5-й Донський проїзд, 15, буд. 6<br />
Телефон/факс: +7 (495) 662-3883 Телефон/факс: +7 (495) 662-3883
</p> </p>
......
notes/license.ru.html.in
View file @ df683736
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
<body> <body>
<h1>Лицензионный договор</h1> <h1>Лицензионный договор</h1>
<h2>на программное обеспечение @BRAND_FNAME@ @VERSION@ @NAME@ и включенные в него программы для ЭВМ</h2> <h2>на программное обеспечение Альт Линукс 5.0 Школьный Сервер и включенные в него программы для ЭВМ</h2>
<p><b>1. Сведения о договоре</b></p> <p><b>1. Сведения о договоре</b></p>
<p>1.1 Участники договора</p> <p>1.1 Участники договора</p>
<p>Настоящий лицензионный договор заключается между ООО «Альт Линукс», обладателем прав на программное обеспечение <p>Настоящий лицензионный договор заключается между ООО «Альт Линукс», обладателем прав на программное обеспечение
<strong>@BRAND_FNAME@ @VERSION@ @NAME@</strong> <strong>Альт Линукс 5.0 Школьный Сервер</strong>
(далее - ДИСТРИБУТИВ), и Вами, владельцем экземпляра ДИСТРИБУТИВА.</p> (далее - ДИСТРИБУТИВ), и Вами, владельцем экземпляра ДИСТРИБУТИВА.</p>
<p>1.2 Предмет договора</p> <p>1.2 Предмет договора</p>
......
notes/release-notes.all.html.in
View file @ df683736
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<TITLE></TITLE> <TITLE></TITLE>
</HEAD> </HEAD>
<BODY> <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> <p>
For security reasons server has no graphical interface, but it could be configured from any other computer from same local network. 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. 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. Open browser and go to that address.
</p> </p>
<h3>Examoles of IP-addresses (SERVER):<br> <h3>Examples of IP-addresses (SERVER):<br>
192.168.0.1<br> 192.168.0.1<br>
10.1.0.2</h3> 10.1.0.2</h3>
<p> <p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment