From 2b52430853c2c51a17bc8989643e047f0f0c729d Mon Sep 17 00:00:00 2001 From: Florent Villard Date: Mon, 10 Apr 2006 15:58:29 +0000 Subject: change version and release method to use rpm instead of shell to interpret mkrel macro --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 98983dc..2c2b0f2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NAME=bootsplash -VERSION := $(shell sed -n 's/%define version //p' < $(NAME).spec) -RELEASE := $(shell sed -n 's/%define release //p' < $(NAME).spec) +VERSION := $(shell rpm -q --qf '%{version}\n' --specfile $(NAME).spec | head -1) +RELEASE := $(shell rpm -q --qf '%{release}\n' --specfile $(NAME).spec | head -1) RELTAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__') SUBDIRS=scripts fb fbmngplay fbtruetype splash po @@ -36,6 +36,7 @@ changelog: ../common/username ) cvstag: + echo $(RELTAG) cvs commit cvs tag $(RELTAG) -- cgit v1.2.1