From ebf9009361cbee57147dac3f9ef4daa2a73a63e0 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Thu, 18 Aug 2022 21:04:24 +0200 Subject: [PATCH] fedora: Change source URL to HEAD link with explicit commit SHA This is required as Fedora doesn't accept a temporary pointer to a source URL. Reported-by: Ralf Corsepius Reported-by: Artur Frenszek-Iwicki Signed-off-by: Stefano Brivio --- contrib/fedora/passt.spec | 4 ++-- contrib/fedora/rpkg.macros | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/fedora/passt.spec b/contrib/fedora/passt.spec index ee8f6a4..fcd5ba9 100644 --- a/contrib/fedora/passt.spec +++ b/contrib/fedora/passt.spec @@ -18,7 +18,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-HEAD.tar.xz +Source: https://passt.top/passt/snapshot/passt-{{{ git_head }}}.tar.xz BuildRequires: gcc, make, checkpolicy, selinux-policy-devel @@ -43,7 +43,7 @@ Requires(preun): policycoreutils, %{name} This package adds SELinux enforcement to passt(1) and pasta(1). %prep -%setup -q -n passt-HEAD +%setup -q -n passt-{{{ git_head }}} %build export CFLAGS="%{optflags}" diff --git a/contrib/fedora/rpkg.macros b/contrib/fedora/rpkg.macros index c9ba03d..2032034 100644 --- a/contrib/fedora/rpkg.macros +++ b/contrib/fedora/rpkg.macros @@ -15,6 +15,10 @@ function git_version { printf "0.git.%s.%s" "$(date -u -I | tr - _)" "$(git rev-parse --short HEAD)" } +function git_head { + git rev-parse HEAD +} + function passt_git_changelog_entry { __from="${2}" __to="${1}"