From 6fa4a975c6eefd6e87dda051e90554a5aa799525 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 13 Nov 2023 17:05:28 +0530 Subject: [PATCH] [CI:BUILD] packit: handle builds for RC releases The `version_no_tilde` rpm macro correctly handles both `vX.Y.Z` and `vX.Y.Z-rcN` git tags. Using this macro instead of `version` will soon allow Packit to handle RC builds correctly. Accompanying change in Packit to land soon: https://github.com/packit/packit/pull/2149 [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar --- rpm/podman.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/podman.spec b/rpm/podman.spec index 3d2f8904ef..be99d282c6 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -75,7 +75,7 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64 Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream -Source0: %{git0}/archive/v%{version}.tar.gz +Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst @@ -208,7 +208,7 @@ It is a symlink to %{_bindir}/%{name} and execs into the `%{name}sh` container when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. %prep -%autosetup -Sgit -n %{name}-%{version} +%autosetup -Sgit -n %{name}-%{version_no_tilde} sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile # These changes are only meant for copr builds