rpms/podman
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not conditionalize sources

Browse Source 
This makes it possible to use a tarball generated on Rawhide/F38 to
build a package for F37 or Fedora ELN.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2023-09-18 12:38:07 -04:00
parent 4c9244acea
commit 115cfab7c7
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
podman.spec
View File

@ -37,7 +37,7 @@
# include it. Official rawhide should be able to fetch the last active build of # include it. Official rawhide should be able to fetch the last active build of
# gvproxy, the min version requirement has been removed to allow it. # gvproxy, the min version requirement has been removed to allow it.
# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2224434 # Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2224434
%if !%{defined copr_username} && 0%{?fedora} <= 37 %if !%{defined copr_username} && 0%{?fedora} && 0%{?fedora} <= 37
%define gvproxy_subpackage 1 %define gvproxy_subpackage 1
%endif %endif
@ -57,12 +57,10 @@
%global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84
%global import_path_plugins %{container_base_path}/%{repo_plugins} %global import_path_plugins %{container_base_path}/%{repo_plugins}
%if %{defined gvproxy_subpackage}
# gvproxy # gvproxy
%global repo_gvproxy gvisor-tap-vsock %global repo_gvproxy gvisor-tap-vsock
%global git_gvproxy %{container_base_url}/%{repo_gvproxy} %global git_gvproxy %{container_base_url}/%{repo_gvproxy}
%global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544 %global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544
%endif
Name: podman Name: podman
%if %{defined copr_username} %if %{defined copr_username}
@ -90,9 +88,7 @@ URL: https://%{name}.io/
# All SourceN files fetched from upstream # All SourceN files fetched from upstream
Source0: %{git0}/archive/v4.7.0-rc1.tar.gz Source0: %{git0}/archive/v4.7.0-rc1.tar.gz
Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz
%if %{defined gvproxy_subpackage}
Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz
%endif
Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
BuildRequires: %{_bindir}/envsubst BuildRequires: %{_bindir}/envsubst
%if %{defined build_with_btrfs} %if %{defined build_with_btrfs}

1
sources
View File

@ -1,2 +1,3 @@
SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
SHA512 (v4.7.0-rc1.tar.gz) = 3a69210db0bc074627818d7990506a361402fbdd70c312464dd351f9664eaea91190fe438cc194cd1f572afbcbba4cf4a187b688c724c1784a01165d8bdaf56c SHA512 (v4.7.0-rc1.tar.gz) = 3a69210db0bc074627818d7990506a361402fbdd70c312464dd351f9664eaea91190fe438cc194cd1f572afbcbba4cf4a187b688c724c1784a01165d8bdaf56c
SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c