diff options
author | David Howells <dhowells@redhat.com> | 2020-04-14 17:04:25 +0100 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2020-05-18 15:15:46 +0100 |
commit | d44a41376b17450c3908978b123e1f05a361885f (patch) | |
tree | f8968c468ec803cedf6c2bfd92a13cfb1e5a4c3f | |
parent | 71c2c288d77410da05376bd1e62c5fbb4a139d41 (diff) | |
download | keyutils-d44a41376b17450c3908978b123e1f05a361885f.tar.gz |
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>
-rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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 := \ |