From db835ca70ac1e41840368f528a69663bf97ca566 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 17 Aug 2022 13:59:00 -0400 Subject: [PATCH] use easier tag macros to make both fedora and debbuild happy Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 43921e4..046e98c 100644 --- a/podman.spec +++ b/podman.spec @@ -33,8 +33,7 @@ %global git_gvproxy https://%{import_path_gvproxy} %global commit_gvproxy fdc231ae7b8fe1aec4cf0b8777274fa21b70d789 -%global built_tag v4.2.0 -%global tarball_tag 4.2.0 +%global built_tag_strip 4.2.0 Name: podman Epoch: 4 @@ -50,7 +49,7 @@ ExclusiveArch: %{golang_arches} %endif Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ -Source0: %{git0}/archive/%{built_tag}.tar.gz +Source0: %{git0}/archive/v%{built_tag_strip}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -246,7 +245,7 @@ gvisor-tap-vsock brings a configurable DNS server and dynamic port forwarding. %prep -%autosetup -Sgit -n %{name}-%{tarball_tag} +%autosetup -Sgit -n %{name}-%{built_tag_strip} sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile # untar dnsname