From 7e6617d2272785d16ccefabd95cd2a79e74924b8 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Mon, 29 Aug 2022 15:36:35 +0200 Subject: [PATCH] fedora: Define git_hash in spec file and reuse it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...as it's used twice. The short version, however, appears hardcoded only once in the output, and it comes straight from the rpkg macro building the version string -- leave that macro as it is. Suggested-by: Daniel P. Berrangé Signed-off-by: Stefano Brivio --- contrib/fedora/passt.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/fedora/passt.spec b/contrib/fedora/passt.spec index 9356858..6125a3b 100644 --- a/contrib/fedora/passt.spec +++ b/contrib/fedora/passt.spec @@ -7,6 +7,8 @@ # Copyright (c) 2022 Red Hat GmbH # Author: Stefano Brivio +%global git_hash {{{ git_head }}} + Name: passt Version: {{{ git_version }}} Release: 1%{?dist} @@ -14,7 +16,7 @@ Summary: User-mode networking daemons for virtual machines and namespaces License: AGPLv3+ and BSD Group: System Environment/Daemons URL: https://passt.top/ -Source: https://passt.top/passt/snapshot/passt-{{{ git_head }}}.tar.xz +Source: https://passt.top/passt/snapshot/passt-%{git_hash}.tar.xz BuildRequires: gcc, make, checkpolicy, selinux-policy-devel @@ -40,7 +42,7 @@ Requires(preun): policycoreutils, %{name} This package adds SELinux enforcement to passt(1) and pasta(1). %prep -%setup -q -n passt-{{{ git_head }}} +%setup -q -n passt-%{git_hash} %build %set_build_flags