From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 2 Nov 2011 10:03:25 +0000 (+0100)
Subject: better version.py yet
X-Git-Tag: sfa-1.1-2~1^2~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=60b7c351f1f17e3af13f7b9f23cb10c630f053ba;p=sfa.git

better version.py yet
---

diff --git a/Makefile b/Makefile
index 3706a3bc..72fa41ac 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,8 @@ uninstall: python-uninstall tests-uninstall
 
 ##########
 rpmversion:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | head -1)
-# somehow this is empty
-rpmtaglevel:=$(shell rpm -q --specfile sfa.spec --queryformat="%{taglevel}\n" 2> /dev/null | head -1)
-rpmtaglevel:=$(if $(rpmtaglevel),$(rpmtaglevel),0)
+# somehow %{taglevel} is empty, turns out %{release} has what we want
+rpmtaglevel:=$(shell rpm -q --specfile sfa.spec --queryformat="%{release}\n" 2> /dev/null | head -1)
 VERSIONTAG=$(rpmversion)-$(rpmtaglevel)
 SCMURL=should-be-redefined-by-specfile