From 098c671c12d06c26df20045c356022500b871190 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 29 Nov 2024 09:45:52 +0300 Subject: [PATCH] import podman-5.3.1-2.el10 --- .gitignore | 2 +- .podman.metadata | 2 +- SPECS/podman.spec | 29 +++++++++++++++++++++++------ 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index e865e68..2c93ab6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v5.2-rhel-458f9b4.tar.gz +SOURCES/podman-5.3.1-4cbdfde.tar.gz diff --git a/.podman.metadata b/.podman.metadata index 189c85b..dbb2aff 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1 +1 @@ -6cc2f34e967629dbf644609511e7dcd8abca3128 SOURCES/v5.2-rhel-458f9b4.tar.gz +bfcaa2bb56d4f906f7366b0bc74a4280324f1d62 SOURCES/podman-5.3.1-4cbdfde.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 5474c5a..1212fe8 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -8,8 +8,8 @@ %endif %global import_path github.com/containers/podman -%global branch v5.2-rhel -%global commit0 458f9b42760bf79aae4a96d0610b22f317ac7714 +#%%global branch v5.2-rhel +%global commit0 4cbdfde5d862dcdbe450c0f1d76ad75360f67a3c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we @@ -57,10 +57,10 @@ Epoch: 6 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 5.2.2 +Version: 5.3.1 # 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 -Release: 1%{?dist} +Release: 2%{?dist} %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else @@ -111,7 +111,6 @@ Requires: containers-common-extra >= 5:0.58.0-1 %else Requires: containers-common-extra %endif -Provides: %{name}-quadlet Obsoletes: %{name}-quadlet <= 5:4.4.0-1 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release} @@ -196,6 +195,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: gvisor-tap-vsock Recommends: qemu Requires: virtiofsd +ExclusiveArch: x86_64 aarch64 %description machine This subpackage installs the dependencies for %{name} machine, for more see: @@ -288,7 +288,7 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker # 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 %{name}sh.1 -e remote -e docker`; do +for file in `find %{buildroot}%{_mandir}/man[157] -type f | sed "s,%{buildroot},," | grep -v -e %{name}sh.1 -e remote -e docker`; do echo "$file*" >> %{name}.file-list done @@ -355,6 +355,23 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %{_libexecdir}/%{name}/virtiofsd %changelog +* Thu Nov 28 2024 Jindrich Novy - 6:5.3.1-2 +- Reduce arches for podman-machine to x86_64 aarch64 +- Resolves: RHEL-69441 + +* Mon Nov 25 2024 Jindrich Novy - 6:5.3.1-1 +- update to https://github.com/containers/podman/releases/tag/v5.3.1 +- Resolves: RHEL-24623 + +* Mon Nov 11 2024 Jindrich Novy - 6:5.2.2-3 +- update to the latest content of https://github.com/containers/podman/tree/v5.2-rhel + (https://github.com/containers/podman/commit/e40738b) +- Resolves: RHEL-61858 + +* Tue Oct 29 2024 Troy Dawson - 6:5.2.2-2 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + * Wed Oct 09 2024 Jindrich Novy - 6:5.2.2-1 - stick to v5.2-rhel upstream branch for RHEL - update to the latest content of https://github.com/containers/podman/tree/v5.2-rhel