From c1a4b1fe29380421389400f71f96056a0632e744 Mon Sep 17 00:00:00 2001 From: lixuebing Date: Tue, 20 Aug 2024 10:57:11 +0800 Subject: [PATCH 1/2] Replaced declaration of help subpackage with the 'package_help' macro. --- podman.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/podman.spec b/podman.spec index 4eb1d3e..ec87f3c 100644 --- a/podman.spec +++ b/podman.spec @@ -2,7 +2,7 @@ Name: podman Version: 4.9.4 -Release: 8 +Release: 9 Summary: A tool for managing OCI containers and pods. Epoch: 1 License: Apache-2.0 and MIT @@ -93,12 +93,9 @@ It is based on the network stack of gVisor. Compared to libslirp, gvisor-tap-vsock brings a configurable DNS server and dynamic port forwarding. -%package help -Summary: Help document for the podman package -Conflicts: docker docker-latest docker-ce docker-ee moby-engine +%package_help -%description help -Help document for the podman package +Conflicts: docker docker-latest docker-ce docker-ee moby-engine %package -n %{name}sh Summary: Confined login and user shell using %{name} @@ -299,6 +296,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_bindir}/%{name}sh %changelog +* Tue Aug 20 2024 Xuebing Li - 1:4.9.4-9 +- Replaced declaration of help subpackage with the 'package_help' macro. + * Tue Apr 30 2024 zhangbowei - 1:4.9.4-8 - Type:bugfix - CVE:NA -- Gitee From df3a13cdbff9f88492c6e27b1a01633821cbea0b Mon Sep 17 00:00:00 2001 From: lixuebing Date: Tue, 20 Aug 2024 11:23:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Add=20=E2=80=9CBuildarch:=20noarch=E2=80=9D?= =?UTF-8?q?=20to=20the=20help=20subpackage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- podman.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index ec87f3c..c128403 100644 --- a/podman.spec +++ b/podman.spec @@ -93,10 +93,14 @@ It is based on the network stack of gVisor. Compared to libslirp, gvisor-tap-vsock brings a configurable DNS server and dynamic port forwarding. -%package_help - +%package help +Summary: Help document for the podman package +Buildarch: noarch Conflicts: docker docker-latest docker-ce docker-ee moby-engine +%description help +Help document for the podman package + %package -n %{name}sh Summary: Confined login and user shell using %{name} Requires: %{name} = %{epoch}:%{version}-%{release} @@ -297,7 +301,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %changelog * Tue Aug 20 2024 Xuebing Li - 1:4.9.4-9 -- Replaced declaration of help subpackage with the 'package_help' macro. +- Add “Buildarch: noarch” to the help subpackage * Tue Apr 30 2024 zhangbowei - 1:4.9.4-8 - Type:bugfix -- Gitee