7.0.0-alt2

branding.spec

@@ -6,7 +6,7 @@
 
 Name: branding-%brand-%theme
 Version: 7.0.0 
-Release: alt1
+Release: alt2
 
 BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-droid
 BuildRequires: design-bootloader-source >= 5.0-alt2
@@ -218,7 +218,7 @@ ALT Linux index.html welcome page.
 
 %build
 autoconf
-THEME=%theme NAME='%Theme' BRAND_FNAME='%Brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%ProductName_ru' X86='%x86' ./configure 
+THEME=%theme NAME='%Theme' BRAND_FNAME='%Brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%ProductName_ru' CODENAME='%codename' X86='%x86' ./configure 
 make
 
 %install
@@ -364,6 +364,9 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr
 %_desktopdir/indexhtml.desktop
 
 %changelog
+* Thu Jul 04 2013 Anton V. Boyarshinov <boyarsh@altlinux.ru> 7.0.0-alt2
+- os-release fixed
+
 * Tue Jun 18 2013 Anton V. Boyarshinov <boyarsh@altlinux.ru> 7.0.0-alt1
 - release version
 

components/systemd/os-release → components/systemd/os-release.in

 NAME="ALT Linux"
-VERSION="6.9.0 alpha (Cheiron)"
+VERSION="@VERSION@ @STATUS_EN@ (@CODENAME@)"
 ID=altlinux
 VERSION_ID=6.9.0
-PRETTY_NAME="ALT Linux 6.9.0 Centaurus alpha (Cheiron)"
+PRETTY_NAME="@BRAND_FNAME@ @VERSION@ @STATUS_EN@ @NAME@ (@CODENAME@)"
 ANSI_COLOR="1;33"
-CPE_NAME="cpe:/o:alt linux:centaurus:6.9.0"
+CPE_NAME="cpe:/o:alt linux:@THEME@:@VERSION@"
 HOME_URL="http://altlinux.ru/"
 BUG_REPORT_URL="https://bugs.altlinux.org/"

configure.ac

@@ -18,6 +18,7 @@ DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
 DOCDIR=documentation
 
 AC_SUBST(THEME)
+AC_SUBST(CODENAME)
 AC_SUBST(NAME)
 AC_SUBST(BRAND)
 AC_SUBST(BRAND_FNAME)
@@ -50,6 +51,7 @@ AC_CONFIG_FILES([
 		 components/bootloader/gfxboot.cfg
 		 components/indexhtml/index-ru.html
 		 components/indexhtml/index-en.html
+		 components/systemd/os-release
 		 kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
 		 notes/release-notes.ru.html
 		 notes/release-notes.all.html