- relup

- drop foreign obsoletes
- add /etc/os-release (http://www.freedesktop.org/software/systemd/man/os-release.html)

Changed files:
    issue-alpha.spec -> 1.20

diff --git a/issue-alpha.spec b/issue-alpha.spec
index 0e5d9a2cd1afd0cde8fbb924ffdba711f24e5b6f..790105a3c62db36e4f342f1f5133dd449488aff5 100644 (file)
--- a/issue-alpha.spec
+++ b/issue-alpha.spec
@@ -7,14 +7,12 @@ Summary:      PLD Linux release file with virtual keyboard
 Summary(pl.UTF-8):     Wersja Linuksa PLD z wirtualną klawiaturą
 Name:          issue-alpha
 Version:       %{distversion}
-Release:       3
+Release:       4
 License:       GPL
 Group:         Base
 Provides:      issue
 Provides:      issue-package
 Obsoletes:     issue-package
-Obsoletes:     redhat-release
-Obsoletes:     mandrake-release
 Conflicts:     issue-fancy < 2.99-2
 Conflicts:     issue-logo < 2.99-2
 Conflicts:     issue-pure < 2.99-5
@@ -59,10 +57,23 @@ echo -ne "\l " >> $RPM_BUILD_ROOT%{_sysconfdir}/issue
 
 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="cpe:/o:pld-linux:pld:%{distversion}"
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%{_sysconfdir}/os-release
 %{_sysconfdir}/pld-release
 %config(noreplace) %{_sysconfdir}/issue*