[packit] 5.0.0-rc1 upstream release

Upstream tag: v5.0.0-rc1
Upstream commit: dc218a3c
This commit is contained in:
Packit 2024-02-08 16:39:24 +00:00
parent eb3ec99899
commit 2ab1bb3d2d
5 changed files with 16 additions and 57 deletions

1
.gitignore vendored
View File

@ -1846,3 +1846,4 @@
/v4.9.0.tar.gz /v4.9.0.tar.gz
/v4.9.1.tar.gz /v4.9.1.tar.gz
/v4.9.2.tar.gz /v4.9.2.tar.gz
/v5.0.0-rc1.tar.gz

View File

@ -67,14 +67,15 @@ jobs:
trigger: release trigger: release
update_release: false update_release: false
dist_git_branches: dist_git_branches:
- fedora-all - fedora-development # Implies fedora-rawhide and any branched but unreleased version, will include f40 before f40 is marked stable.
- job: koji_build - job: koji_build
trigger: commit trigger: commit
dist_git_branches: dist_git_branches:
- fedora-all - fedora-development
- job: bodhi_update # TODO: Revisit once fedora 40 is branched and manual bodhi is enabled
trigger: commit #- job: bodhi_update
dist_git_branches: #trigger: commit
- fedora-branched # rawhide updates are created automatically #dist_git_branches:
#- fedora-40 # rawhide updates are created automatically

View File

@ -1,3 +1,3 @@
This repository is maintained by packit. This repository is maintained by packit.
https://packit.dev/ https://packit.dev/
The file was generated using packit 0.90.0.post1.dev3+g3d9551d2. The file was generated using packit 0.90.0.post1.dev9+g1f0325d1.

View File

@ -45,12 +45,6 @@
# %%{name} # %%{name}
%global git0 %{container_base_url}/%{name} %global git0 %{container_base_url}/%{name}
# dnsname
%global repo_plugins dnsname
%global git_plugins %{container_base_url}/%{repo_plugins}
%global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84
%global import_path_plugins %{container_base_path}/%{repo_plugins}
Name: podman Name: podman
%if %{defined copr_build} %if %{defined copr_build}
Epoch: 102 Epoch: 102
@ -63,7 +57,7 @@ Epoch: 5
# If that's what you're reading, Version must be 0, and will be updated by Packit for # If that's what you're reading, Version must be 0, and will be updated by Packit for
# copr and koji builds. # copr and koji builds.
# If you're reading this on dist-git, the version is automatically filled in by Packit. # If you're reading this on dist-git, the version is automatically filled in by Packit.
Version: 4.9.2 Version: 5.0.0~rc1
# The `AND` needs to be uppercase in the License for SPDX compatibility # The `AND` needs to be uppercase in the License for SPDX compatibility
License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
Release: %autorelease Release: %autorelease
@ -76,7 +70,6 @@ Summary: Manage Pods, Containers and Container Images
URL: https://%{name}.io/ URL: https://%{name}.io/
# All SourceN files fetched from upstream # All SourceN files fetched from upstream
Source0: %{git0}/archive/v%{version_no_tilde}.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} Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
BuildRequires: %{_bindir}/envsubst BuildRequires: %{_bindir}/envsubst
%if %{defined build_with_btrfs} %if %{defined build_with_btrfs}
@ -181,19 +174,6 @@ run %{name}-remote in production.
manage pods, containers and container images. %{name}-remote supports ssh manage pods, containers and container images. %{name}-remote supports ssh
connections as well. connections as well.
%package plugins
Summary: Plugins for %{name}
Requires: dnsmasq
Recommends: gvisor-tap-vsock
%description plugins
This plugin sets up the use of dnsmasq on a given CNI network so
that Pods can resolve each other by name. When configured,
the pod and its IP address are added to a network specific hosts file
that dnsmasq will read in. Similarly, when a pod
is removed from the network, it will remove the entry from the hosts
file. Each CNI network will have its own dnsmasq instance.
%package -n %{name}sh %package -n %{name}sh
Summary: Confined login and user shell using %{name} Summary: Confined login and user shell using %{name}
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
@ -211,6 +191,11 @@ when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0].
%autosetup -Sgit -n %{name}-%{version_no_tilde} %autosetup -Sgit -n %{name}-%{version_no_tilde}
sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile
# cgroups-v1 is supported on rhel9
%if 0%{?rhel} == 9
sed -i '/DELETE ON RHEL9/,/DELETE ON RHEL9/d' libpod/runtime.go
%endif
# These changes are only meant for copr builds # These changes are only meant for copr builds
%if %{defined copr_build} %if %{defined copr_build}
# podman --version should show short sha # podman --version should show short sha
@ -219,9 +204,6 @@ sed -i "s/^const RawVersion = .*/const RawVersion = \"##VERSION##-##SHORT_SHA##\
sed -i "s/^var Version.*/var Version, err = semver.ParseTolerant(rawversion.RawVersion)/" version/version.go sed -i "s/^var Version.*/var Version, err = semver.ParseTolerant(rawversion.RawVersion)/" version/version.go
%endif %endif
# untar dnsname
tar zxf %{SOURCE1}
%build %build
%set_build_flags %set_build_flags
export CGO_CFLAGS=$CFLAGS export CGO_CFLAGS=$CFLAGS
@ -264,19 +246,6 @@ LDFLAGS=''
%{__make} docs docker-docs %{__make} docs docker-docs
# build dnsname the old way otherwise it fails on koji
cd %{repo_plugins}-%{commit_plugins}
mkdir _build
cd _build
mkdir -p src/%{container_base_path}
ln -s ../../../../ src/%{import_path_plugins}
cd ..
ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd)
%define gomodulesmode GO111MODULE=off
%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname
cd ..
%install %install
install -dp %{buildroot}%{_unitdir} install -dp %{buildroot}%{_unitdir}
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{_sysconfdir} \ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{_sysconfdir} \
@ -293,11 +262,6 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{_sysc
sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker
# install dnsname plugin
cd %{repo_plugins}-%{commit_plugins}
%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
cd ..
# do not include docker and podman-remote man pages in main package # do not include docker and podman-remote man pages in main package
for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do
echo "$file*" >> podman.file-list echo "$file*" >> podman.file-list
@ -352,12 +316,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
%files tests %files tests
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%files plugins
%license %{repo_plugins}-%{commit_plugins}/LICENSE
%doc %{repo_plugins}-%{commit_plugins}/{README.md,README_PODMAN.md}
%dir %{_libexecdir}/cni
%{_libexecdir}/cni/dnsname
%files -n %{name}sh %files -n %{name}sh
%{_bindir}/%{name}sh %{_bindir}/%{name}sh

View File

@ -1,2 +1 @@
SHA512 (v4.9.2.tar.gz) = 09f6c1839d67fb7404688c8fc6fcb65471ca9f9d1651f7c5c57baa52eb64f0a8f73523d7761a857794b6307d3a943aecd92fc247dd193ccf1d53eb234f9f6ff5 SHA512 (v5.0.0-rc1.tar.gz) = 95452d5489b167cff24620b5a7504e1363d8276cf4e7c026d43ea2e9b24dde1c595b6e763a1065087d876e5ad56e62f7cda6e53838abdeac7eeb3deadcfd88ae
SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8