From d44a41376b17450c3908978b123e1f05a361885f Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 14 Apr 2020 17:04:25 +0100 Subject: 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 --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index dde318c..6f79446 100644 --- a/Makefile +++ b/Makefile @@ -268,12 +268,12 @@ SRCBALL := rpmbuild/SOURCES/$(TARBALL) ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL) BUILDID := .local -dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm)) -release0:= $(word 2,$(shell grep ^Release: $(SPECFILE))) -release1:= $(subst %{?dist},$(dist),$(release0)) -release2:= $(subst %{?buildid},$(BUILDID),$(release1)) -release := $(shell echo $(release2) | sed -e s!%{[^}]*}!!g) -rpmver := $(VERSION)-$(release) +rpmver0 := $(shell rpmspec -q ./keyutils.spec --define "buildid $(BUILDID)") +rpmver1 := $(word 1,$(rpmver0)) +rpmver2 := $(subst ., ,$(rpmver1)) +rpmver3 := $(lastword $(rpmver2)) +rpmver4 := $(patsubst %.$(rpmver3),%,$(rpmver1)) +rpmver := $(patsubst keyutils-%,%,$(rpmver4)) SRPM := rpmbuild/SRPMS/keyutils-$(rpmver).src.rpm RPMBUILDDIRS := \ -- cgit v1.2.1