Change version to 3.0 and add snap bcond

Th is 3.0 everywhere else, it is in constant development, so there is no
point in sticking to the 2.99 number and we can as well put the real version
here. Also added snap bcond for building /etc/issue and release files
for official Th snapshots.

diff --git a/issue-alpha.spec b/issue-alpha.spec
index 790105a3c62db36e4f342f1f5133dd449488aff5..c4d64b4d49bb3b830dd0e8b8cc764830b38248f4 100644 (file)
--- a/issue-alpha.spec
+++ b/issue-alpha.spec
@@ -1,21 +1,37 @@
 
+%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        distversion     2.99
+%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 virtual keyboard
 Summary(pl.UTF-8):     Wersja Linuksa PLD z wirtualną klawiaturą
 Name:          issue-alpha
 Version:       %{distversion}
-Release:       4
+Release:       1%{?with_snap:.%{snapshot}}
 License:       GPL
 Group:         Base
 Provides:      issue
 Provides:      issue-package
 Obsoletes:     issue-package
-Conflicts:     issue-fancy < 2.99-2
-Conflicts:     issue-logo < 2.99-2
-Conflicts:     issue-pure < 2.99-5
+Conflicts:     issue-fancy < 3.0
+Conflicts:     issue-logo < 3.0
+Conflicts:     issue-nice < 3.0
+Conflicts:     issue-pure < 3.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,7 +82,8 @@ ID="pld"
 VERSION_ID="%{distversion}"
 PRETTY_NAME="PLD Linux %{distversion} (%{distname})"
 ANSI_COLOR="0;32"
-CPE_NAME="cpe:/o:pld-linux:pld:%{distversion}"
+CPE_NAME="%{cpename}"
+HOME_URL="http://www.pld-linux.org/"
 EOF
 
 %clean