From: David Howells <dhowells@redhat.com>
Date: Tue, 12 May 2020 00:16:17 +0000 (+0100)
Subject: Makefile: Use rpmspec to calculate package name
X-Git-Tag: v0.4~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e795c04ff780c250db643c67ffd490d63fc9ee68;p=users%2Fdhowells%2Fkafs-client.git

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 ad67936..ce75ad6 100644
--- 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 := \