[packages/issue-logo] - {pld,os}-release moved to separate package, update BRs accordingly - all version/name data taken o

[baggins]

commit f51aeba37069238e92c41bf220eb06e93433c7dc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jun 16 21:13:28 2013 +0200

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

 issue-logo.spec | 60 ++++++++++++++-------------------------------------------
 1 file changed, 14 insertions(+), 46 deletions(-)
---
diff --git a/issue-logo.spec b/issue-logo.spec
index 34d39a1..f318588 100644
--- a/issue-logo.spec
+++ b/issue-logo.spec
@@ -1,31 +1,16 @@
+%define	distnamever	%(. /etc/os-release && echo $VERSION)
+%define	distversion	%(. /etc/os-release && echo $VERSION_ID)
 
-%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 with logo
-Summary(de.UTF-8):	PLD Linux Release-Datei mit logo
-Summary(pl.UTF-8):	Wersja Linuksa PLD z logiem
+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}
-Release:	1%{?with_snap:.%{snapshot}}
+Release:	2
 License:	GPL
 Group:		Base
+BuildRequires:	pld-release >= 3.0
+%requires_eq	pld-release
 Provides:	issue
 Conflicts:	issue-alpha < 3.0-1
 Conflicts:	issue-fancy < 3.0-1
@@ -35,13 +20,14 @@ BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-PLD Linux release file with logo.
+PLD Linux prelogin message and identification file with logo.
 
 %description -l de.UTF-8
-PLD Linux Release-Datei mit logo.
+PLD Linux Systemidentifikationsdatei mit logo.
 
 %description -l pl.UTF-8
-Wersja Linuksa PLD z logiem.
+Plik z logiem identyfikujący system PLD Linux,
+wyświetlany przed zalogowaniem.
 
 %prep
 
@@ -51,7 +37,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue <<EOF
   _
- / )     PLD Linux %{distversion} (%{distname}) \m, \r
+ / )     PLD Linux %{distnamever} \m, \r
 / /       Welcome to \n
  ( -.      \u user(s)
  \\\\   \\\\
@@ -66,7 +52,7 @@ echo -ne "\l " >> $RPM_BUILD_ROOT%{_sysconfdir}/issue
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue.net <<EOF
   _
- / )     PLD Linux %{distversion} (%{distname}) %m, %r
+ / )     PLD Linux %{distnamever} %m, %r
 / /       Welcome to %h
  ( -.
  \\\\   \\\\
@@ -77,27 +63,9 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue.net <<EOF
 
 EOF
 
-echo %{distrelease} > $RPM_BUILD_ROOT%{_sysconfdir}/pld-release
-
-# CPE_NAME = cpe:/ {part} : {vendor} : {product} : {version} : {update} : {edition} : {language}
-# http://cpe.mitre.org/specification/
-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-logo.git/commitdiff/f51aeba37069238e92c41bf220eb06e93433c7dc