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

baggins baggins at pld-linux.org
Sun Jun 16 22:23:05 CEST 2013


commit d3271c21d646c81a76262b4baf0803e107fd5582
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jun 16 22:23:04 2013 +0200

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

 issue.spec | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/issue.spec b/issue.spec
index 78690e7..19058b7 100644
--- a/issue.spec
+++ b/issue.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
-Version:	%{distversion}
+Version:	3.0
 Release:	2
 License:	GPL
 Group:		Base
@@ -66,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue <<EOF
- .------------------------< PLD Linux %{distnamever} >------------------------*
+ .------------------------< PLD Linux %{distversion} >------------------------*
 :|:
 :|:  Welcome to \n
 :|:  \d \t
@@ -78,7 +77,7 @@ EOF
 echo -ne "\l " >> $RPM_BUILD_ROOT%{_sysconfdir}/issue
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue.net <<EOF
- .------------------------< PLD Linux %{distnamever} >--------*
+ .------------------------< PLD Linux %{distversion} >--------*
 :|:
 :|:  Welcome to %h
 :|:  %d
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/issue.git/commitdiff/d3271c21d646c81a76262b4baf0803e107fd5582



More information about the pld-cvs-commit mailing list