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

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

diff --git a/issue-logo.spec b/issue-logo.spec
index c2187b0..2176b18 100644
--- a/issue-logo.spec
+++ b/issue-logo.spec
@@ -1,11 +1,10 @@
-%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 with logo
 Summary(de.UTF-8):	PLD Linux Systemidentifikationsdatei mit logo
 Summary(pl.UTF-8):	Plik z logiem identyfikujący system PLD Linux, wyświetlany przed zalogowaniem
 Name:		issue-logo
-Version:	%{distversion}
+Version:	3.0
 Release:	2
 License:	GPL
 Group:		Base
@@ -37,7 +36,7 @@ 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)
  \\\\   \\\\
@@ -52,7 +51,7 @@ 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
  ( -.
  \\\\   \\\\