- finally fixed the case when file is unreadable

[packages/issue-alpha.git] / issue-alpha.spec

diff --git a/issue-alpha.spec b/issue-alpha.spec
index 57b65bb6d1f3562a75b6a9c6cb3bf86203eced63..53898eb8e1cf825b7fa57e909a437a90cf15217f 100644 (file)
--- a/issue-alpha.spec
+++ b/issue-alpha.spec
@@ -1,33 +1,16 @@
-
-%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})"
+%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})
 
 Summary:       PLD Linux release file with virtual keyboard
 Summary(pl.UTF-8):     Wersja Linuksa PLD z wirtualną klawiaturą
 Name:          issue-alpha
 Version:       %{distversion}
-Release:       1%{?with_snap:.%{snapshot}}
+Release:       2
 License:       GPL
 Group:         Base
+BuildRequires: pld-release >= 3.0
+%requires_eq   pld-release
 Provides:      issue
-Provides:      issue-package
-Obsoletes:     issue-package
 Conflicts:     issue-fancy < 3.0-1
 Conflicts:     issue-logo < 3.0-1
 Conflicts:     issue-nice < 3.0-1
@@ -52,7 +35,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/issue.net <<EOF
-.-------------< PLD Linux %{distversion} (%{distname}) >--------------.
+.-------------< PLD Linux %{distnamever} >--------------.
 |                                                 |
 |  ~  !  "  #  $  %  ^  &  *  (  )  _  +          |
 | ' \`  1  2  3  4  5  6  7  8  9  0  -  =         |
@@ -71,27 +54,9 @@ EOF
 cat $RPM_BUILD_ROOT%{_sysconfdir}/issue.net > $RPM_BUILD_ROOT%{_sysconfdir}/issue
 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="%{cpename}"
-HOME_URL="http://www.pld-linux.org/"
-BUG_REPORT_URL="https://bugs.launchpad.net/pld-linux/"
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_sysconfdir}/os-release
-%{_sysconfdir}/pld-release
 %config(noreplace) %{_sysconfdir}/issue*