[packages/issue] - {pld,os}-release move to separate package, updata BRs accordingly - proper summary/description - a

baggins baggins at pld-linux.org
Sun Jun 16 20:41:43 CEST 2013 

commit 8de0f0596a994e03829f8d265cb1773cf9af1e67
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jun 16 20:34:12 2013 +0200

    - {pld,os}-release move to separate package, updata BRs accordingly
    - proper summary/description
    - all version/name data taken out from /etc/os-release at build time

 issue.spec | 128 ++++++++++++++-----------------------------------------------
 1 file changed, 28 insertions(+), 100 deletions(-)
---
diff --git a/issue.spec b/issue.spec
index 6100a8d..f5a361e 100644
--- a/issue.spec
+++ b/issue.spec
@@ -1,48 +1,23 @@
 
-%bcond_with	snap	# include shapshot information in version,
-			# should be used only in official Th spanhots
-
-%define snapshot	2012
-
-# CPE_NAME = cpe:/ {part} : {vendor} : {product} : {version} : {update} : {edition} : {language}
-# http://cpe.mitre.org/specification/
-# http://csrc.nist.gov/publications/nistir/ir7695/NISTIR-7695-CPE-Naming.pdf
-
-%if %{with snap}
-%define	distname	Th/%{snapshot}
-%define cpename		cpe:/o:pld-linux:pld:%{distversion}:%{snapshot}
-%else
-%define	distname	Th
-%define cpename		cpe:/o:pld-linux:pld:%{distversion}
-%endif
-%define	distversion	3.0
-%define	distrelease	"%{distversion} PLD Linux (%{distname})"
-
-Summary:	PLD Linux release file
-Summary(cs.UTF-8):	Soubor s číslem verze systému PLD Linux
-Summary(da.UTF-8):	PLD Linux release fil
-Summary(de.UTF-8):	PLD Linux Release-Datei
-Summary(es.UTF-8):	El fichero con la versión de PLD Linux
-Summary(fr.UTF-8):	Fichier de version de PLD Linux
-Summary(id.UTF-8):	File rilis PLD Linux
-Summary(is.UTF-8):	Útgáfuskráin fyrir PLD Linux
-Summary(it.UTF-8):	File della release di PLD Linux
-Summary(ja.UTF-8):	PLD Linux リリースファイル
-Summary(ko.UTF-8):	PLD Linux 배포 파일
-Summary(nb.UTF-8):	PLD Linux release fil
-Summary(pl.UTF-8):	Wersja Linuksa PLD
-Summary(pt.UTF-8):	O ficheiro de versão final do PLD Linux
-Summary(ru.UTF-8):	Файл релиза PLD Linux
-Summary(sk.UTF-8):	Súbor označujúci verziu PLD Linux
-Summary(sl.UTF-8):	Datoteka s podatki o izdaji PLD Linuxa
-Summary(sv.UTF-8):	PLD Linux versionsfil
-Summary(tr.UTF-8):	PLD Linux sürüm dosyası
-Summary(zh_CN.UTF-8):	PLD Linux 版本文件。
+%define	distnamever	%(. /etc/os-release && echo $VERSION)
+%define	distversion	%(. /etc/os-release && echo $VERSION_ID)
+
+Summary:	PLD Linux prelogin message and identification file
+Summary(de.UTF-8):	PLD Linux Systemidentifikationsdatei
+Summary(es.UTF-8):	Mensaje pre-entrada y fichero de identificación del sistema de PLD Linux
+Summary(fr.UTF-8):	Message d'identification du système avant la connexion de PLD Linux
+Summary(it.UTF-8):	Messaggio di identificazione prima del login di PLD Linux
+Summary(ja.UTF-8):	PLD Linux の ログイン前に表示されるメッセージとシステム情報のファイル
+Summary(pl.UTF-8):	Plik identyfikujący system PLD Linux, wyświetlany przed zalogowaniem
+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}
-Release:	1%{?with_snap:.%{snapshot}}
+Release:	1
 License:	GPL
 Group:		Base
+BuildRequires:	pld-release >= 3.0
+%requires_eq	pld-release
 Provides:	issue-package
 Obsoletes:	issue-alpha
 Obsoletes:	issue-fancy
@@ -58,64 +33,33 @@ BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-PLD Linux release file.
-
-%description -l cs.UTF-8
-Soubor s číslem verze systému PLD Linux.
-
-%description -l da.UTF-8
-PLD Linux release fil.
+PLD Linux prelogin message and identification file.
 
 %description -l de.UTF-8
-PLD Linux Release-Datei.
+PLD Linux Systemidentifikationsdatei.
 
 %description -l es.UTF-8
-El fichero con la versión de PLD Linux.
+Mensaje pre-entrada y fichero de identificación del sistema de
+PLD Linux.
 
 %description -l fr.UTF-8
-Fichier de version de PLD Linux.
-
-%description -l id.UTF-8
-File rilis PLD Linux.
-
-%description -l is.UTF-8
-Útgáfuskráin fyrir PLD Linux.
+Message d'identification du système avant la connexion de PLD Linux.
 
 %description -l it.UTF-8
-File della release di PLD Linux.
+Messaggio di identificazione prima del login di PLD Linux.
 
 %description -l ja.UTF-8
-PLD Linux リリースファイル
-
-%description -l ko.UTF-8
-PLD Linux 배포 파일.
-
-%description -l nb.UTF-8
-PLD Linux release fil.
+PLD Linux の ログイン前に表示されるメッセージとシステム情報のファイル。
 
 %description -l pl.UTF-8
-Wersja Linuksa PLD.
+Plik identyfikujący system PLD Linux, wyświetlany przed zalogowaniem.
 
 %description -l pt.UTF-8
-O ficheiro de versão final do PLD Linux.
+Mensagem anteriores ao login e arquivo de identificaçăo do PLD Linux.
 
 %description -l ru.UTF-8
-Файл релиза PLD Linux.
-
-%description -l sk.UTF-8
-Súbor označujúci verziu PLD Linux.
-
-%description -l sl.UTF-8
-Datoteka s podatki o izdaji PLD Linuxa.
-
-%description -l sv.UTF-8
-PLD Linux versionsfil.
-
-%description -l tr.UTF-8
-PLD Linux sürüm dosyası.
-
-%description -l zh_CN.UTF-8
-PLD Linux 版本文件。
+Файл идентификации, содержащий сообщение, выдаваемым перед
+приглашением в систему PLD Linux.
 
 %prep
 
@@ -124,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue <<EOF
- .------------------------< PLD Linux %{distversion} (%{distname}) >------------------------*
+ .------------------------< PLD Linux %{distnamever} >------------------------*
 :|:
 :|:  Welcome to \n
 :|:  \d \t
@@ -136,7 +80,7 @@ EOF
 echo -ne "\l " >> $RPM_BUILD_ROOT%{_sysconfdir}/issue
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue.net <<EOF
- .------------------------< PLD Linux %{distversion} (%{distname}) >--------*
+ .------------------------< PLD Linux %{distnamever} >--------*
 :|:
 :|:  Welcome to %h
 :|:  %d
@@ -145,25 +89,9 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue.net <<EOF
 
 EOF
 
-echo %{distrelease} > $RPM_BUILD_ROOT%{_sysconfdir}/pld-release
-
-cat >$RPM_BUILD_ROOT%{_sysconfdir}/os-release <<EOF
-NAME="PLD Linux"
-VERSION="%{distversion} (%{distname})"
-ID="pld"
-VERSION_ID="%{distversion}"
-PRETTY_NAME="PLD Linux %{distversion} (%{distname})"
-ANSI_COLOR="0;32"
-CPE_NAME="%{cpename}"
-HOME_URL="http://www.pld-linux.org/"
-BUG_REPORT_URL="http://bugs.pld-linux.org/"
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_sysconfdir}/os-release
-%{_sysconfdir}/pld-release
 %config(noreplace) %{_sysconfdir}/issue*
================================================================

---- gitweb:

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

More information about the pld-cvs-commit mailing list