diff options
| author | David Howells <dhowells@redhat.com> | 2019-09-02 14:06:03 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-09-04 10:43:57 +0100 |
| commit | 7a3ee1510c2e21ce2f4508539e64a57174ed7333 (patch) | |
| tree | 29c2a32f2ab8665f647483a0ebf2774904d3bfe5 | |
| parent | 2bdef38877b11be9ddc31362518b37c8019120cd (diff) | |
| download | keyutils-7a3ee1510c2e21ce2f4508539e64a57174ed7333.tar.gz | |
rpm: Fix version determination for "make rpm"
Fix the determination of the version string for "make rpm" by making sure
that all otherwise unhandled %{...} variable substitutions get deleted.
Signed-off-by: David Howells <dhowells@redhat.com>
| -rw-r--r-- | Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -269,10 +269,10 @@ 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)) +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) SRPM := rpmbuild/SRPMS/keyutils-$(rpmver).src.rpm @@ -287,13 +287,15 @@ RPMBUILDDIRS := \ RPMFLAGS := \ --define "buildid $(BUILDID)" -rpm: +srpm: mkdir -p rpmbuild chmod ug-s rpmbuild mkdir -p rpmbuild/{SPECS,SOURCES,BUILD,BUILDROOT,RPMS,SRPMS} git archive --prefix=keyutils-$(VERSION)/ --format tar -o $(SRCBALL) HEAD bzip2 -9 <$(SRCBALL) >$(ZSRCBALL) rpmbuild -ts $(ZSRCBALL) --define "_srcrpmdir rpmbuild/SRPMS" $(RPMFLAGS) + +rpm: srpm rpmbuild --rebuild $(SRPM) $(RPMBUILDDIRS) $(RPMFLAGS) rpmlint: rpm @@ -312,3 +314,5 @@ show_vars: @echo BUILDFOR=$(BUILDFOR) @echo SONAME=$(SONAME) @echo LIBNAME=$(LIBNAME) + @echo SRPM=$(SRPM) + @echo rpmver=$(rpmver) |