commit 149bf4f4a63897f6fe3bcf024f56967949ea6234
Author: Jan Rękorajski <[email protected]>
Date: Mon Aug 20 14:36:20 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.spec | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
---
diff --git a/issue.spec b/issue.spec
index 221b015..5a323d5 100644
--- a/issue.spec
+++ b/issue.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
@@ -25,7 +40,7 @@ Summary(tr.UTF-8): PLD Linux sürüm dosyası
Summary(zh_CN.UTF-8): PLD Linux 版本文件。
Name: issue
Version: %{distversion}
-Release: 4
+Release: 1%{?with_snap:.%{snapshot}}
License: GPL
Group: Base
Provides: issue-package
@@ -34,10 +49,11 @@ Obsoletes: issue-fancy
Obsoletes: issue-logo
Obsoletes: issue-package
Obsoletes: issue-pure
-Conflicts: issue-alpha < 2.99-2
-Conflicts: issue-fancy < 2.99-2
-Conflicts: issue-logo < 2.99-2
-Conflicts: issue-pure < 2.99-5
+Conflicts: issue-alpha < 3.0
+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)
@@ -131,8 +147,6 @@ EOF
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})"
@@ -140,7 +154,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
