Makefile: Use rpmspec to calculate package name

Use the rpmspec program to calculate the package name rather than trying to
substitute macros that keep changing.

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/Makefile b/Makefile
index ad679367a1c19b63e1a00d3a4aab8d71e0e7b6b1..ce75ad64d9b677583ec393df01bb75be78a50f7a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -104,12 +104,12 @@ SRCBALL   := rpmbuild/SOURCES/$(TARBALL)
 ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
 
 BUILDID        := .local
-dist   := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm))
-release3:= $(word 2,$(shell grep ^Release: $(SPECFILE)))
-release2:= $(subst %{?dist},$(dist),$(release3))
-release1:= $(subst %{?buildid},$(BUILDID),$(release2))
-release        := $(subst %{?distprefix},,$(release1))
-rpmver := $(VERSION)-$(release)
+rpmver0        := $(shell rpmspec -q ./redhat/kafs-client.spec --define "buildid $(BUILDID)")
+rpmver1        := $(word 1,$(rpmver0))
+rpmver2        := $(subst ., ,$(rpmver1))
+rpmver3        := $(lastword $(rpmver2))
+rpmver4        := $(patsubst %.$(rpmver3),%,$(rpmver1))
+rpmver := $(patsubst kafs-client-%,%,$(rpmver4))
 SRPM   := rpmbuild/SRPMS/kafs-client-$(rpmver).src.rpm
 
 RPMBUILDDIRS := \