Fix name in several places

a048e40d · Andrey Cherepanov · c3817eeb · a048e40d · a048e40d · a048e40d
Commit a048e40d authored Aug 07, 2013 by Andrey Cherepanov
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

branding.spec branding.spec +1 -1

index-en.html.in components/indexhtml/index-en.html.in +2 -2

os-release.in components/systemd/os-release.in +3 -3

No files found.
--- a/branding.spec
+++ b/branding.spec
@@ -276,7 +276,7 @@ __EOF__

 #release
 install -pD -m644 /dev/null %buildroot%_sysconfdir/buildreqs/packages/ignore.d/%name-release
-echo "%Name %version %status (%codename)" >%buildroot%_sysconfdir/altlinux-release
+echo "%Name %version %status_en (%codename)" >%buildroot%_sysconfdir/altlinux-release
 for n in fedora redhat system; do
 	ln -s altlinux-release %buildroot%_sysconfdir/$n-release
 done

--- a/components/indexhtml/index-en.html.in
+++ b/components/indexhtml/index-en.html.in
@@ -2,7 +2,7 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

 <!-- Disto name in title -->
-<title>@NAME@ @VERSION@@STATUS@</title>
+<title>@PRODUCT_NAME@</title>

 <link href="index.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,7 +16,7 @@
 </div>

 <!-- Disto name -->
-<div id="title">@NAME@ @VERSION@</div>
+<div id="title">@PRODUCT_NAME@</div>

 <div id="main">
 <!-- Links columns -->

--- a/components/systemd/os-release.in
+++ b/components/systemd/os-release.in
@@ -2,8 +2,8 @@ NAME="@NAME@"
 VERSION="@VERSION@@STATUS@ (@CODENAME@)"
 ID=altlinux
 VERSION_ID=@VERSION@
-PRETTY_NAME="@NAME@ @VERSION@@STATUS@ (@CODENAME@)"
+PRETTY_NAME="@PRODUCT_NAME@ (@CODENAME@)"
 ANSI_COLOR="1;36"
-CPE_NAME="cpe:/o:alt linux:slinux:@VERSION@"
-HOME_URL="http://simplylinux.ru/"
+CPE_NAME="cpe:/o:alt linux:school teacher:@VERSION@"
+HOME_URL="http://altlinux.ru/"
 BUG_REPORT_URL="https://bugs.altlinux.org/"