From 3803aed9fb1272f9b581d45aa4e3a322f1cd3739 Mon Sep 17 00:00:00 2001 From: Arnstein Ressem Date: Wed, 22 Sep 2021 13:28:38 +0200 Subject: Fix lazy command expansion that did not work. --- .copr/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to '.copr/Makefile') diff --git a/.copr/Makefile b/.copr/Makefile index 488f2360450..b0322bf29b3 100644 --- a/.copr/Makefile +++ b/.copr/Makefile @@ -1,9 +1,6 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) -# Version -VESPA_VERSION = $(shell git tag --points-at HEAD | grep -oP "\d+\.\d+\.\d+" | sort -V | tail -1) - RPMTOPDIR := $(HOME)/rpmbuild SOURCEDIR := $(RPMTOPDIR)/SOURCES SPECDIR := $(RPMTOPDIR)/SPECS @@ -11,7 +8,7 @@ SPECFILE := $(SPECDIR)/vespa-$(VESPA_VERSION).spec srpm: dnf install -y git rpmdevtools - $(TOP)/../dist.sh $(VESPA_VERSION) + $(TOP)/../dist.sh $$(git tag --points-at HEAD | grep -oP "\d+\.\d+\.\d+" | sort -V | tail -1) spectool -g -C $(SOURCEDIR) $(SPECFILE) rpmbuild -bs --define "_topdir $(RPMTOPDIR)" $(SPECFILE) cp -a $(RPMTOPDIR)/SRPMS/* $(outdir) -- cgit v1.2.3