From fb59cfc9093b2c68d5fa65bb6eb4d4042dab0593 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Tue, 7 Jun 2022 17:44:30 +0200 Subject: [PATCH] contrib/fedora: Use pre-processing macros in spec file ...they seem to be supported by COPR now and make things simpler. Signed-off-by: Stefano Brivio --- contrib/fedora/passt.spec | 13 +++++++------ contrib/fedora/rpkg.conf | 15 +++++++++++++++ contrib/fedora/rpkg.macros | 16 ++++++++++++++++ 3 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 contrib/fedora/rpkg.conf create mode 100644 contrib/fedora/rpkg.macros diff --git a/contrib/fedora/passt.spec b/contrib/fedora/passt.spec index 4411271..ed5c4f6 100644 --- a/contrib/fedora/passt.spec +++ b/contrib/fedora/passt.spec @@ -12,12 +12,14 @@ # Author: Stefano Brivio Name: passt -Version: 0.git.202206071425.67103ea -Release: 0 +Version: {{{ git_version }}} +Release: 0%{?dist} 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-67103ea556da00106da900f20aac286511171ea2.tar.xz +VCS: git://passt.top/passt +Source: https://passt.top/passt/snapshot/passt-HEAD.tar.xz BuildRequires: gcc, make, checkpolicy, selinux-policy-devel @@ -42,7 +44,7 @@ Requires(preun): policycoreutils, %{name} This package adds SELinux enforcement to passt(1) and pasta(1). %prep -%setup -q +%setup -q -n passt-HEAD %build export CFLAGS="%{optflags}" @@ -91,5 +93,4 @@ semodule -r pasta 2>/dev/null || : %{_datadir}/selinux/packages/%{name}/pasta.pp %changelog -* Tue Jun 07 2022 Stefano Brivio 0.git.202206071425.67103ea -- Pro forma: example +{{{ git_dir_changelog }}} diff --git a/contrib/fedora/rpkg.conf b/contrib/fedora/rpkg.conf new file mode 100644 index 0000000..2b88e8f --- /dev/null +++ b/contrib/fedora/rpkg.conf @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: AGPL-3.0-or-later +# +# PASST - Plug A Simple Socket Transport +# for qemu/UNIX domain socket mode +# +# PASTA - Pack A Subtle Tap Abstraction +# for network namespace/tap device mode +# +# contrib/fedora/rpkg.conf - Configuration file for rpkg (for COPR builds) +# +# Copyright (c) 2022 Red Hat GmbH +# Author: Stefano Brivio + +[rpkg] +user_macros = "${git_props:root}/contrib/fedora/rpkg.macros" diff --git a/contrib/fedora/rpkg.macros b/contrib/fedora/rpkg.macros new file mode 100644 index 0000000..9e0cd78 --- /dev/null +++ b/contrib/fedora/rpkg.macros @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: AGPL-3.0-or-later +# +# PASST - Plug A Simple Socket Transport +# for qemu/UNIX domain socket mode +# +# PASTA - Pack A Subtle Tap Abstraction +# for network namespace/tap device mode +# +# contrib/fedora/rpkg.macros - rpkg macros (for COPR builds) +# +# Copyright (c) 2022 Red Hat GmbH +# Author: Stefano Brivio + +function git_version { + printf "0.git.%s.%s" "$(date -u -I | tr - _)" "$(git rev-parse --short HEAD)" +}