From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 16 Jun 2013 20:22:30 +0000 (+0200)
Subject: - fixed version, only use /etc/os-release for generating issue file
X-Git-Tag: auto/th/issue-pure-3.0-2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=16a3829592cf5fcaf29a4ec1a0eac83d2a2649be;p=packages%2Fissue-pure.git

- fixed version, only use /etc/os-release for generating issue file
---

diff --git a/issue-pure.spec b/issue-pure.spec
index 4565310..7a81e6b 100644
--- a/issue-pure.spec
+++ b/issue-pure.spec
@@ -1,5 +1,4 @@
-%define	distnamever	%(. /etc/os-release 2>/dev/null ; echo $VERSION)
-%define	distversion	%([ -e /etc/os-release ] && . /etc/os-release 2>/dev/null ; echo ${VERSION_ID:-0})
+%define	distversion	%(. /etc/os-release 2>/dev/null ; echo $VERSION)
 
 Summary:	PLD Linux prelogin message and identification file
 Summary(de.UTF-8):	PLD Linux Systemidentifikationsdatei
@@ -11,7 +10,7 @@ Summary(pl.UTF-8):	Plik identyfikujący system PLD Linux, wyświetlany przed zal
 Summary(pt.UTF-8):	Mensagem anteriores ao login e arquivo de identificaçăo do PLD Linux
 Summary(ru.UTF-8):	Файл идентификации, содержащий сообщение, выдаваемым перед приглашением в систему PLD Linux
 Name:		issue-pure
-Version:	%{distversion}
+Version:	3.0
 Release:	2
 License:	GPL
 Group:		Base
@@ -61,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue <<EOF
-PLD Linux %{distnamever} \m, \r
+PLD Linux %{distversion} \m, \r
 Welcome to \n
 \u user(s)
 
@@ -69,7 +68,7 @@ EOF
 echo -ne "\l " >> $RPM_BUILD_ROOT%{_sysconfdir}/issue
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue.net <<EOF
-PLD Linux %{distnamever} %m, %r
+PLD Linux %{distversion} %m, %r
 Welcome to %h
 
 EOF