Skip to content

Commit 8605031

Browse files
author
marcel
committed
Fix rpmtar target to use RELEASE variable instead of parsing spec file
The rpmtar target was extracting the version by grepping the spec file: grep "^%define version" pkg/rpm/sems.spec | awk '{print $3}' After the spec file was changed to use %(cat VERSION) RPM macro syntax, the grep/awk extracted the literal string "%(cat" instead of the actual version, causing the tarball to be named "sems-%(cat.tar.gz". Fix by using the existing RELEASE variable from Makefile.defs, which already correctly reads and processes the VERSION file.
1 parent 4b863c7 commit 8605031

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ tar:
8383
# the tarball can be used for rpm building
8484
.PHONY: rpmtar
8585
rpmtar:
86-
$(eval RPM_VERSION := $(shell grep "^%define version" pkg/rpm/sems.spec | awk '{print $$3}'))
86+
$(eval RPM_VERSION := $(RELEASE))
8787
rm -rf /tmp/_tar1
8888
rm -rf /tmp/_tar2
8989
rm -rf "~/rpmbuild/SOURCES/$(NAME)-*.tar.gz"

0 commit comments

Comments
 (0)