diff --git a/podman.spec b/podman.spec index 2430da7..87beb20 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.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -44,8 +44,8 @@ Source3: https://github.com/containers/%{name}-machine-cni/archive/%{commit_mcni Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar.gz # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures ExclusiveArch: %{go_arches} -Provides: %{name}-manpages = %{version}-%{release} -Obsoletes: %{name}-manpages < %{version}-%{release} +Provides: %{name}-manpages = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} BuildRequires: golang >= 1.16.6 BuildRequires: glib2-devel BuildRequires: glibc-devel @@ -101,7 +101,7 @@ manipulate images (but not containers) created by the other. Summary: Emulate Docker CLI using %{name} BuildArch: noarch Requires: %{name} = %{epoch}:%{version}-%{release} -Provides: docker = %{version}-%{release} +Provides: docker = %{epoch}:%{version}-%{release} %description docker This package installs a script named docker that emulates the Docker CLI by @@ -137,7 +137,7 @@ signalfd(2)) and has no additional features. %package plugins Summary: Plugins for %{name} Requires: dnsmasq -Recommends: %{name}-gvproxy = %{version}-%{release} +Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release} %description plugins This plugin sets up the use of dnsmasq on a given CNI network so @@ -399,6 +399,10 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Tue Oct 19 2021 Jindrich Novy - 1:3.4.1-2 +- more dependency tightening - thanks to Michael Rochefort for noticing +- Related: #2000051 + * Mon Oct 18 2021 Jindrich Novy - 1:3.4.1-1 - update to the latest content of https://github.com/containers/podman/tree/v3.4 (https://github.com/containers/podman/commit/c15c154)