Update to 5.2.0 upstream release

Upstream tag: v5.2.0
Upstream commit: b22d5c61

Commit authored by Packit automation (https://packit.dev/)
This commit is contained in:
Jindrich Novy 2024-08-05 08:10:57 +02:00
parent 36933748d2
commit e5ff73faba
4 changed files with 60 additions and 25 deletions

View File

@ -12,6 +12,8 @@ packages:
podman-centos: podman-centos:
pkg_tool: centpkg pkg_tool: centpkg
specfile_path: rpm/podman.spec specfile_path: rpm/podman.spec
podman-rhel:
specfile_path: rpm/podman.spec
srpm_build_deps: srpm_build_deps:
- git-archive-all - git-archive-all
@ -25,32 +27,39 @@ jobs:
- job: copr_build - job: copr_build
trigger: pull_request trigger: pull_request
packages: [podman-fedora] packages: [podman-fedora]
notifications: notifications: &packit_build_failure_notification
failure_comment: failure_comment:
message: "Ephemeral COPR build failed. @containers/packit-build please check." message: "Ephemeral COPR build failed. @containers/packit-build please check."
enable_net: true enable_net: true
targets: targets:
- fedora-all-x86_64 fedora-all-x86_64: {}
- fedora-all-aarch64 fedora-all-aarch64: {}
- fedora-eln-x86_64 fedora-eln-x86_64:
- fedora-eln-aarch64 additional_repos:
additional_repos: - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
- "copr://rhcontainerbot/podman-next" fedora-eln-aarch64:
additional_repos:
- "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/"
- job: copr_build - job: copr_build
trigger: pull_request trigger: pull_request
packages: [podman-centos] packages: [podman-centos]
notifications: notifications: *packit_build_failure_notification
failure_comment: enable_net: true
message: "Ephemeral COPR build failed. @containers/packit-build please check." targets:
- centos-stream-9-x86_64
- centos-stream-9-aarch64
- centos-stream-10-x86_64
- centos-stream-10-aarch64
- job: copr_build
trigger: pull_request
packages: [podman-rhel]
notifications: *packit_build_failure_notification
enable_net: true enable_net: true
targets: targets:
- epel-9-x86_64 - epel-9-x86_64
- epel-9-aarch64 - epel-9-aarch64
- centos-stream-10-x86_64
- centos-stream-10-aarch64
additional_repos:
- "copr://rhcontainerbot/podman-next"
# Run on commit to main branch # Run on commit to main branch
- job: copr_build - job: copr_build

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.97.3. The file was generated using packit 0.99.0.

View File

@ -52,7 +52,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: 5.1.2 Version: 5.2.0
# 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
@ -101,12 +101,6 @@ Requires: containers-common-extra >= 5:0.58.0-1
%else %else
Requires: containers-common-extra Requires: containers-common-extra
%endif %endif
%if %{defined rhel} && !%{defined eln}
Recommends: gvisor-tap-vsock-gvforwarder
%else
Requires: gvisor-tap-vsock-gvforwarder
%endif
Recommends: gvisor-tap-vsock
Provides: %{name}-quadlet Provides: %{name}-quadlet
Obsoletes: %{name}-quadlet <= 5:4.4.0-1 Obsoletes: %{name}-quadlet <= 5:4.4.0-1
Provides: %{name}-quadlet = %{epoch}:%{version}-%{release} Provides: %{name}-quadlet = %{epoch}:%{version}-%{release}
@ -186,6 +180,17 @@ capabilities specified in user quadlets.
It is a symlink to %{_bindir}/%{name} and execs into the `%{name}sh` container 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]. when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0].
%package machine
Summary: Metapackage for setting up %{name} machine
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: gvisor-tap-vsock
Requires: qemu
Requires: virtiofsd
%description machine
This subpackage installs the dependencies for %{name} machine, for more see:
https://docs.podman.io/en/latest/markdown/podman-machine.1.html
%prep %prep
%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
@ -240,6 +245,10 @@ export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs btrfs_noversion remot
export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)"
%gobuild -o bin/quadlet ./cmd/quadlet %gobuild -o bin/quadlet ./cmd/quadlet
# build %%{name}-testing
export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)"
%gobuild -o bin/podman-testing ./cmd/podman-testing
# reset LDFLAGS for plugins binaries # reset LDFLAGS for plugins binaries
LDFLAGS='' LDFLAGS=''
@ -255,6 +264,12 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI
install.docker \ install.docker \
install.docker-docs \ install.docker-docs \
install.remote \ install.remote \
install.testing
# Only need this on Fedora until nftables becomes the default
%if %{defined fedora}
%{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load
%endif
sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker
@ -265,8 +280,11 @@ done
rm -f %{buildroot}%{_mandir}/man5/docker*.5 rm -f %{buildroot}%{_mandir}/man5/docker*.5
install -d -p %{buildroot}/%{_datadir}/%{name}/test/system install -d -p %{buildroot}%{_datadir}/%{name}/test/system
cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ cp -pav test/system %{buildroot}%{_datadir}/%{name}/test/
# symlink virtiofsd in %%{name} libexecdir for machine subpackage
ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name}
#define license tag if not already defined #define license tag if not already defined
%{!?_licensedir:%global license %doc} %{!?_licensedir:%global license %doc}
@ -289,6 +307,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
%{_tmpfilesdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf
%{_systemdgeneratordir}/%{name}-system-generator %{_systemdgeneratordir}/%{name}-system-generator
%{_systemdusergeneratordir}/%{name}-user-generator %{_systemdusergeneratordir}/%{name}-user-generator
%if %{defined fedora}
%{_modulesloaddir}/%{name}-iptables.conf
%endif
%files docker %files docker
%{_bindir}/docker %{_bindir}/docker
@ -308,12 +329,17 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
%{_datadir}/zsh/site-functions/_%{name}-remote %{_datadir}/zsh/site-functions/_%{name}-remote
%files tests %files tests
%{_bindir}/%{name}-testing
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%files -n %{name}sh %files -n %{name}sh
%{_bindir}/%{name}sh %{_bindir}/%{name}sh
%{_mandir}/man1/%{name}sh.1* %{_mandir}/man1/%{name}sh.1*
%files machine
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/virtiofsd
%changelog %changelog
%if %{defined autochangelog} %if %{defined autochangelog}
%autochangelog %autochangelog

View File

@ -1 +1 @@
SHA512 (v5.1.2.tar.gz) = adfd4dc5a1f7e1887ca5ffc0c6ec4593f051566010c3cc7050294fd50d2cab3d0257ff6ea4cc1abd2ba8b12adcfe0310446ac66bfc2280d9a9597294ecbcd474 SHA512 (v5.2.0.tar.gz) = cc5ac92ebeaac03074c1221fa4cbc3ea62af95d0d444208b88368208089e146ff2693281033caaecd909a5f01fe4a3f8a199fef8c6c9901c281431011e19f729