commit c0fd914f92542944b7e4df61c3beebc18c949cb5
Author: Jan Rękorajski <[email protected]>
Date: Mon Aug 20 14:41:49 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-logo.spec | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/issue-logo.spec b/issue-logo.spec
index dc0c41c..5298645 100644
--- a/issue-logo.spec
+++ b/issue-logo.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,13 +23,14 @@ Summary(de.UTF-8): PLD Linux Release-Datei mit logo
Summary(pl.UTF-8): Wersja Linuksa PLD z logiem
Name: issue-logo
Version: %{distversion}
-Release: 4
+Release: 1%{?with_snap:.%{snapshot}}
License: GPL
Group: Base
Provides: issue
-Conflicts: issue-alpha < 2.99-2
-Conflicts: issue-fancy < 2.99-2
-Conflicts: issue-pure < 2.99-5
+Conflicts: issue-alpha < 3.0
+Conflicts: issue-fancy < 3.0
+Conflicts: issue-nice < 3.0
+Conflicts: issue-pure < 3.0
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,7 +88,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
