From d8ac6e49c6f412981080c9bdfad653b798c3f52c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Apr 2021 11:10:46 -0400 Subject: [PATCH] podman-2:3.2.0-0.3.dev.git35b62ef - slirp4netns and fuse-overlayfs deps are in containers-common Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 15 +++++++-------- sources | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 385a6a6..49f1788 100644 --- a/.gitignore +++ b/.gitignore @@ -1734,3 +1734,4 @@ /podman-df1d561.tar.gz /podman-259004f.tar.gz /podman-373f15f.tar.gz +/podman-35b62ef.tar.gz diff --git a/podman.spec b/podman.spec index 585eb30..cb394a2 100644 --- a/podman.spec +++ b/podman.spec @@ -31,7 +31,7 @@ # To build a random user's fork/commit, comment out above line, # uncomment below line and replace the placeholders and commit0 below with the right info #%%global git0 https://github.com/$GITHUB_USER/$GITHUB_USER_REPO -%global commit0 373f15f617db6731c58776c1766a4cf2c74b22b9 +%global commit0 35b62ef19f307fb365eb7a8734e456160f7b22a8 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global repo_plugins dnsname @@ -58,7 +58,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.dev.git%{shortcommit0}%{?dist} +Release: 0.3.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -86,17 +86,13 @@ BuildRequires: make BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel -Requires: conmon >= 2:2.0.16-1 +Requires: conmon >= 2:2.0.28-0.1 Requires: containers-common >= 4:1-17 -Requires: containernetworking-plugins >= 0.8.6-1 +Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} -Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit -Recommends: slirp4netns >= 0.3.0-2 -Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} -Obsoletes: oci-systemd-hook <= 0.2.0-3 # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort @@ -624,6 +620,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Apr 16 2021 Lokesh Mandvekar - 2:3.2.0-0.3.dev.git35b62ef +- slirp4netns and fuse-overlayfs deps are in containers-common + * Thu Apr 15 2021 Lokesh Mandvekar - 2:3.2.0-0.2.dev.git373f15f - container-selinux and crun dependencies moved to containers-common diff --git a/sources b/sources index ae14668..bf53e1a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (podman-373f15f.tar.gz) = d016bd5e71604fce2e82a4a9f9b0f24f2b3a7763cb51470c869608f826aabdda5481442ea2fafe4c6ceb1b0f858cd8cf789b7e2f086b4e46aeaec0ce303637a5 +SHA512 (podman-35b62ef.tar.gz) = ba0bfbd28526f9943caead11fc1146b05d9b715d2c9936e523660ce86178538867a154e7dc63d4d6df4b43c599dea15a9b8e9785b363d0967cd9c4774927f5e5