From 60b7c351f1f17e3af13f7b9f23cb10c630f053ba Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 2 Nov 2011 11:03:25 +0100 Subject: [PATCH] better version.py yet --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 -- 2.43.0