commit 7c7ac1e5bd5e140fba3176c821356f15502b7db1
Author: Jan Rękorajski <[email protected]>
Date: Mon Aug 20 14:41:30 2012 +0200
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.
issue-fancy.spec | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/issue-fancy.spec b/issue-fancy.spec
index bba03c4..edfe487 100644
--- a/issue-fancy.spec
+++ b/issue-fancy.spec
@@ -1,6 +1,21 @@
+%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 logo
@@ -8,7 +23,7 @@ Summary(de.UTF-8): PLD Linux Release-Datei mit logo
Summary(pl.UTF-8): Wersja Linuksa PLD z logiem
Name: issue-fancy
Version: %{distversion}
-Release: 5
+Release: 1%{?with_snap:.%{snapshot}}
License: GPL
Group: Base
Source0: %{name}-gen
@@ -22,9 +37,10 @@ Requires: crondaemon
Provides: issue
Provides: issue-package
Obsoletes: issue-package
-Conflicts: issue-alpha < 2.99-2
-Conflicts: issue-logo < 2.99-2
-Conflicts: issue-pure < 2.99-5
+Conflicts: issue-alpha < 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)
@@ -59,7 +75,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
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
