From de26e6a62d44e5a3a9c2ba2141fca9076a767ade Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Fri, 2 Oct 2020 11:50:36 -0400
Subject: [PATCH] overrides: fast-track newer podman and friends

All contained within this bodhi update:
https://bodhi.fedoraproject.org/updates/FEDORA-2020-7b6058fec9
---
 manifest-lock.overrides.aarch64.yaml | 10 ++++++++++
 manifest-lock.overrides.ppc64le.yaml | 10 ++++++++++
 manifest-lock.overrides.s390x.yaml   | 10 ++++++++++
 manifest-lock.overrides.x86_64.yaml  | 10 ++++++++++
 manifest-lock.x86_64.json            | 11 ++++-------
 5 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/manifest-lock.overrides.aarch64.yaml b/manifest-lock.overrides.aarch64.yaml
index 83466cb963..a3f7d0ddf1 100644
--- a/manifest-lock.overrides.aarch64.yaml
+++ b/manifest-lock.overrides.aarch64.yaml
@@ -35,3 +35,13 @@ packages:
     evra: 246.4-3.fc33.noarch
   systemd-udev:
     evra: 246.4-3.fc33.aarch64
+  # Fast-track the next set of podman (and friends) updates
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-7b6058fec9
+  podman:
+    evra: 2:2.1.1-7.fc33.aarch64
+  crun:
+    evra: 0.15-5.fc33.aarch64
+  skopeo:
+    evra: 1:1.2.0-1.fc33.aarch64
+  containers-common:
+    evra: 1:1.2.0-1.fc33.aarch64
diff --git a/manifest-lock.overrides.ppc64le.yaml b/manifest-lock.overrides.ppc64le.yaml
index 57ef804ab4..f95fac0ba2 100644
--- a/manifest-lock.overrides.ppc64le.yaml
+++ b/manifest-lock.overrides.ppc64le.yaml
@@ -35,3 +35,13 @@ packages:
     evra: 246.4-3.fc33.noarch
   systemd-udev:
     evra: 246.4-3.fc33.ppc64le
+  # Fast-track the next set of podman (and friends) updates
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-7b6058fec9
+  podman:
+    evra: 2:2.1.1-7.fc33.ppc64le
+  crun:
+    evra: 0.15-5.fc33.ppc64le
+  skopeo:
+    evra: 1:1.2.0-1.fc33.ppc64le
+  containers-common:
+    evra: 1:1.2.0-1.fc33.ppc64le
diff --git a/manifest-lock.overrides.s390x.yaml b/manifest-lock.overrides.s390x.yaml
index 756a3d853b..2189a84d98 100644
--- a/manifest-lock.overrides.s390x.yaml
+++ b/manifest-lock.overrides.s390x.yaml
@@ -35,3 +35,13 @@ packages:
     evra: 246.4-3.fc33.noarch
   systemd-udev:
     evra: 246.4-3.fc33.s390x
+  # Fast-track the next set of podman (and friends) updates
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-7b6058fec9
+  podman:
+    evra: 2:2.1.1-7.fc33.s390x
+  crun:
+    evra: 0.15-5.fc33.s390x
+  skopeo:
+    evra: 1:1.2.0-1.fc33.s390x
+  containers-common:
+    evra: 1:1.2.0-1.fc33.s390x
diff --git a/manifest-lock.overrides.x86_64.yaml b/manifest-lock.overrides.x86_64.yaml
index 9ea1b6bc13..479a7ae749 100644
--- a/manifest-lock.overrides.x86_64.yaml
+++ b/manifest-lock.overrides.x86_64.yaml
@@ -35,3 +35,13 @@ packages:
     evra: 246.4-3.fc33.noarch
   systemd-udev:
     evra: 246.4-3.fc33.x86_64
+  # Fast-track the next set of podman (and friends) updates
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-7b6058fec9
+  podman:
+    evra: 2:2.1.1-7.fc33.x86_64
+  crun:
+    evra: 0.15-5.fc33.x86_64
+  skopeo:
+    evra: 1:1.2.0-1.fc33.x86_64
+  containers-common:
+    evra: 1:1.2.0-1.fc33.x86_64
diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json
index d5b6e0eabf..0fd730c40f 100644
--- a/manifest-lock.x86_64.json
+++ b/manifest-lock.x86_64.json
@@ -136,7 +136,7 @@
       "evra": "0.8.7-1.fc33.x86_64"
     },
     "containers-common": {
-      "evra": "1:1.0.1-16.dev.git091f924.fc33.x86_64"
+      "evra": "1:1.2.0-1.fc33.x86_64"
     },
     "coreos-installer": {
       "evra": "0.7.0-3.fc33.x86_64"
@@ -157,7 +157,7 @@
       "evra": "2.9.6-24.fc33.x86_64"
     },
     "crun": {
-      "evra": "0.15-3.fc33.x86_64"
+      "evra": "0.15-5.fc33.x86_64"
     },
     "crypto-policies": {
       "evra": "20200918-1.git85dccc5.fc33.noarch"
@@ -982,10 +982,7 @@
       "evra": "1.7.3-2.fc33.x86_64"
     },
     "podman": {
-      "evra": "2:2.1.0-0.179.dev.git43f2771.fc33.x86_64"
-    },
-    "podman-plugins": {
-      "evra": "2:2.1.0-0.179.dev.git43f2771.fc33.x86_64"
+      "evra": "2:2.1.1-7.fc33.x86_64"
     },
     "policycoreutils": {
       "evra": "3.1-4.fc33.x86_64"
@@ -1087,7 +1084,7 @@
       "evra": "15-8.x86_64"
     },
     "skopeo": {
-      "evra": "1:1.0.1-16.dev.git091f924.fc33.x86_64"
+      "evra": "1:1.2.0-1.fc33.x86_64"
     },
     "slang": {
       "evra": "2.3.2-8.fc33.x86_64"