From 06c601234feac4f5da7b6e1d92430d62f556f3b9 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 4 Feb 2022 10:15:17 -0500
Subject: [PATCH] bump to v4.0.0-rc4, adjust dependencies

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore  |  1 +
 podman.spec | 15 ++-------------
 sources     |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index f486658..7a8ecc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1795,3 +1795,4 @@
 /v4.0.0-rc1.tar.gz
 /v4.0.0-rc2.tar.gz
 /v4.0.0-rc3.tar.gz
+/v4.0.0-rc4.tar.gz
diff --git a/podman.spec b/podman.spec
index da7a41f..5f98b44 100644
--- a/podman.spec
+++ b/podman.spec
@@ -14,11 +14,6 @@
 # https://github.com/containers/%%{name}
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
-# 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 d32e56658aec5246c3a5dc4d2156918d4f3031a7
-#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
 # dnsname
 %global repo_plugins dnsname
@@ -36,7 +31,7 @@
 %global commit_gvproxy 4ee84d66bd86668f011733d8873989b5862bcd07
 %global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7})
 
-%global built_tag v4.0.0-rc3
+%global built_tag v4.0.0-rc4
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 
 Name: podman
@@ -46,11 +41,7 @@ Epoch: 3
 Epoch: 0
 %endif
 Version: 4.0.0
-# RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER
-# 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.4.rc3%{?dist}
+Release: 0.5.rc4%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and BSD and ISC and MIT
 URL: https://%{name}.io/
@@ -85,10 +76,8 @@ BuildRequires: systemd
 BuildRequires: systemd-devel
 Requires: conmon >= 2:2.0.30-2
 Requires: containers-common >= 4:1-46
-Requires: containernetworking-plugins >= 1.0.0-15.1
 Requires: iptables
 Requires: nftables
-Recommends: %{name}-plugins = %{epoch}:%{version}-%{release}
 Recommends: catatonit
 Suggests: qemu-user-static
 
diff --git a/sources b/sources
index 49c36df..ed99ecd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
 SHA512 (gvisor-tap-vsock-4ee84d6.tar.gz) = 6b0e97f25f0c9ec0f018edcf9c1801daaeacc4d97d05cc2b453467e071c50693bb44d483bac34e64e0c9de71e78e47810a7c46d028553adee9fd6f593df8eb1a
-SHA512 (v4.0.0-rc3.tar.gz) = 4446509526e77aa1a317262c6d09c468a7753580077bb5cf28e065bfa7ba8b86e2f8ea620a92de94616bf48f2d0121a051363df327118d0fbc50a99f4ca6c814
+SHA512 (v4.0.0-rc4.tar.gz) = f668138919be30b7ee9e7f125437cd9fa32c64d28f7e7428b4b59b7103643bce19031be3234fcee484eb9b5195b472ad6e02ea911254d40db1cd7adafc05fb9b