From 21e0ae63a6d4a84bd5d8b4539159d39c29b1436c Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Sat, 7 Oct 2023 18:42:20 +0000 Subject: [PATCH] build: fix rpm builds, broken by ef9a63b: support package revisions --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d8ca459..6e3e7bd 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,6 @@ _debs_or_rpms_docker: # artifacts/_zrepl.zsh_completion artifacts/bash_completio rpm: $(ARTIFACTDIR) # artifacts/_zrepl.zsh_completion artifacts/bash_completion docs zrepl-bin $(eval _ZREPL_RPM_VERSION := $(subst -,.,$(_ZREPL_VERSION))) - $(eval _ZREPL_RPM_RELEASE := $(subst -,.,$(ZREPL_PACKAGE_RELEASE))) $(eval _ZREPL_RPM_TOPDIR_ABS := $(CURDIR)/$(ARTIFACTDIR)/rpmbuild) rm -rf "$(_ZREPL_RPM_TOPDIR_ABS)" mkdir "$(_ZREPL_RPM_TOPDIR_ABS)" @@ -88,7 +87,7 @@ rpm: $(ARTIFACTDIR) # artifacts/_zrepl.zsh_completion artifacts/bash_completion done sed \ -e "s/^Version:.*/Version: $(_ZREPL_RPM_VERSION)/g" \ - -e "s/^Release:.*/Release: $(_ZREPL_RPM_RELEASE)/g" \ + -e "s/^Release:.*/Release: $(ZREPL_PACKAGE_RELEASE)/g" \ packaging/rpm/zrepl.spec \ > $(_ZREPL_RPM_TOPDIR_ABS)/SPECS/zrepl.spec