Skip to content

Commit

Permalink
[CI:BUILD] packit: handle builds for RC releases
Browse files Browse the repository at this point in the history
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:
packit/packit#2149

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <[email protected]>
  • Loading branch information
lsm5 committed Nov 13, 2023
1 parent 8e6fe99 commit 6fa4a97
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rpm/podman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 6fa4a97

Please sign in to comment.