From e746c8980bbe4c5cfb1de539693d99f75acd717e Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Mar 25 2021 17:28:44 +0000
Subject: podman-2:3.1.0-0.3.rc2


- bump crun and dnsname deps

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

---

diff --git a/.gitignore b/.gitignore
index 5cd3a68..b60291c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1270,4 +1270,5 @@
 /v3.0.0.tar.gz
 /v3.0.1.tar.gz
 /v3.1.0-rc1.tar.gz
+/dnsname-3b29247.tar.gz
 /v3.1.0-rc2.tar.gz
diff --git a/podman.spec b/podman.spec
index 1d4d8dd..1b4d343 100644
--- a/podman.spec
+++ b/podman.spec
@@ -36,7 +36,7 @@
 # https://github.com/containers/libpod
 %global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins}
 %global git_plugins https://%{import_path_plugins}
-%global commit_plugins c654c95366ac5f309ca3e5727c9b858864247328
+%global commit_plugins 3b29247c46d2811610ad57dd9fdae61157532a5b
 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7})
 
 # Used for comparing with latest upstream tag
@@ -56,7 +56,7 @@ Version: 3.1.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.rc2%{?dist}
+Release: 0.3.rc2%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: https://%{name}.io/
@@ -65,7 +65,7 @@ Source0: %{download_url}
 # uncomment below Source0, and replace the placeholders with the right info
 # Also, adjust %%prep section as necessary.
 #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz
-Source1: https://github.com/containers/dnsname/archive/c654c95366ac5f309ca3e5727c9b858864247328/dnsname-c654c95.tar.gz
+Source1: https://github.com/containers/dnsname/archive/3b29247c46d2811610ad57dd9fdae61157532a5b/dnsname-3b29247.tar.gz
 Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release}
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
@@ -96,20 +96,12 @@ BuildRequires: btrfs-progs-devel
 BuildRequires: ostree-devel
 Recommends: fuse-overlayfs >= 0.3-8
 %endif
-%if 0%{?fedora} || 0%{?centos} >= 8
 Requires: oci-runtime >= 2
-Recommends: crun >= 0.17-3
+Recommends: crun >= 0.18-4
 Recommends: catatonit
 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release}
 Requires: (container-selinux if selinux-policy)
 Recommends: slirp4netns >= 1.1.8-1
-%else
-Requires: catatonit
-Requires: container-selinux
-Requires: runc >= 2:1.0.0-148.rc93
-Requires: slirp4netns >= 0.3.0-2
-Requires: %{name}-plugins = %{epoch}:%{version}-%{release}
-%endif
 
 # vendored libraries
 # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort
@@ -452,9 +444,7 @@ file.  Each CNI network will have its own dnsmasq instance.
 
 %prep
 %autosetup -Sgit -n %{name}-%{built_tag_strip}
-%ifarch %{ix86} armv7hl
-sed -i 's/id128StringMax := C.ulong/id128StringMax := C.uint/' vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go
-%endif
+sed -i 's/id128StringMax := C.ulong/id128StringMax := C.size_t/' vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go
 
 # untar dnsname
 tar zxf %{SOURCE1}
@@ -676,6 +666,9 @@ exit 0
 
 # rhcontainerbot account currently managed by lsm5
 %changelog
+* Thu Mar 25 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:3.1.0-0.3.rc2
+- bump crun and dnsname deps
+
 * Tue Mar 23 2021 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:3.1.0-0.2.rc2
 - autobuilt v3.1.0-rc2
 
diff --git a/sources b/sources
index 65ed12d..35378bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0
+SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d
 SHA512 (v3.1.0-rc2.tar.gz) = 4f16f6ba83717b252038aa330f59dd64707323a9bfefb442860a8cc3f7e0263f8aebd613902c6c282c7fdd8c9e402e0162306900d25a591b8f0767e74ff589ad