diff --git a/podman.spec b/podman.spec index 4275183..6938a27 100644 --- a/podman.spec +++ b/podman.spec @@ -29,7 +29,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 1 Name: podman Version: 3.4.3 -Release: 0.4%{?dist} +Release: 0.5%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -42,7 +42,8 @@ Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz Source2: https://github.com/containers/dnsname/archive/v%{dnsnamever}.tar.gz Source3: https://github.com/containers/%{name}-machine-cni/archive/%{commit_mcni}/%{name}-machine-cni-%{shortcommit_mcni}.tar.gz Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/containers/podman/pull/12118.patch +# backported: https://patch-diff.githubusercontent.com/raw/containers/podman/pull/12118.patch +Patch0: 12118.patch # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures ExclusiveArch: %{go_arches} Provides: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -403,6 +404,11 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Mon Nov 22 2021 Jindrich Novy - 1:3.4.3-0.5 +- do not put patch URL as the backported patch will get overwritten when + "spectool -g -f" is executed +- Related: #2000051 + * Mon Nov 22 2021 Jindrich Novy - 1:3.4.3-0.4 - update to the latest content of https://github.com/containers/podman/tree/v3.4 (https://github.com/containers/podman/commit/7203178)