From a3178611dc9a39eadc41a54665b6c86f0aad58705bfb2b680abc2272c2c164e3 Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Sat, 9 Dec 2023 09:05:56 +0000
Subject: [PATCH 1/2] Accepting request 1132087 from
 home:danishprakash:branches:devel:microos

Default to the new networking backend, netavark, on openSUSE (bsc#1217828)

OBS-URL: https://build.opensuse.org/request/show/1132087
OBS-URL: https://build.opensuse.org/package/show/devel:microos/podman?expand=0&rev=41
---
 podman.changes |  5 +++++
 podman.spec    | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/podman.changes b/podman.changes
index 12bdc39..83e1113 100644
--- a/podman.changes
+++ b/podman.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec  7 08:43:26 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
+
+- Default to the new networking backend, netavark, on openSUSE (bsc#1217828)
+
 -------------------------------------------------------------------
 Wed Dec 06 06:02:02 UTC 2023 - danish.prakash@suse.com
 
diff --git a/podman.spec b/podman.spec
index 35b208d..de90bb5 100644
--- a/podman.spec
+++ b/podman.spec
@@ -52,13 +52,21 @@ Recommends:     apparmor-parser
 # requirement for `podman machine`
 Recommends:     gvisor-tap-vsock
 Requires:       catatonit >= 0.1.7
-# prefer Podman's new network stack on ALP
+# provide both cni and netavark on TW
+# but "prefer" netavark especially for
+# fresh installations (bsc#1217828)
+%if 0%{?suse_version} > 1600
+Requires:       (netavark or cni)
+Suggests:       netavark
+%else
+# default to Netavark on ALP
 %if 0%{suse_version} >= 1600 && !0%{?is_opensuse}
 Requires:       netavark
 %else
 Requires:       cni
 Requires:       cni-plugins
 %endif
+%endif
 Requires:       conmon >= 2.0.24
 Requires:       fuse-overlayfs
 Requires:       iptables

From 52f35dc79a2a186e53ad0d28add59a334c5da8b4cb2b73f1cc35939d4b8016d1 Mon Sep 17 00:00:00 2001
From: Danish Prakash <danish.prakash@suse.com>
Date: Tue, 12 Dec 2023 03:11:35 +0000
Subject: [PATCH 2/2] Accepting request 1132535 from
 home:ojkastl_buildservice:Branch_devel_microos

update to 4.8.2

OBS-URL: https://build.opensuse.org/request/show/1132535
OBS-URL: https://build.opensuse.org/package/show/devel:microos/podman?expand=0&rev=42
---
 _service            |  2 +-
 _servicedata        |  2 +-
 podman-4.8.1.tar.xz |  3 ---
 podman-4.8.2.tar.xz |  3 +++
 podman.changes      | 11 +++++++++++
 podman.spec         |  2 +-
 6 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 podman-4.8.1.tar.xz
 create mode 100644 podman-4.8.2.tar.xz

diff --git a/_service b/_service
index 8194265..32ed9be 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
   <service name="tar_scm" mode="manual">
     <param name="url">https://github.com/containers/podman.git</param>
     <param name="scm">git</param>
-    <param name="revision">v4.8.1</param>
+    <param name="revision">v4.8.2</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>
     <param name="versionrewrite-pattern">v(.*)</param>
diff --git a/_servicedata b/_servicedata
index 698a9a9..f412efb 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/containers/podman.git</param>
-              <param name="changesrevision">ef6e5ac40302770027e7598ee09d177454adcd2f</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">aa546902fa1a927b3d770528565627d1395b19f3</param></service></servicedata>
\ No newline at end of file
diff --git a/podman-4.8.1.tar.xz b/podman-4.8.1.tar.xz
deleted file mode 100644
index 1df3e12..0000000
--- a/podman-4.8.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e5a4d3f1863d50d55752e921aaf8c9c3d17264480eccb36fedb5b089ce392e3
-size 13431816
diff --git a/podman-4.8.2.tar.xz b/podman-4.8.2.tar.xz
new file mode 100644
index 0000000..bf70fc2
--- /dev/null
+++ b/podman-4.8.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0dd0a145e2bb5f25fcdb3de40d1cc8916d0253a0b93c8ef403ca7b08f2c1af2
+size 13424576
diff --git a/podman.changes b/podman.changes
index 83e1113..6dcfbfd 100644
--- a/podman.changes
+++ b/podman.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Dec 11 16:13:48 UTC 2023 - kastl@b1-systems.de
+
+- Update to version 4.8.2:
+  * v4.8.2
+  * [CI:DOCS] Update RELEASE_NOTES.md for v4.8.2
+  * Kube Play - set ReportWriter when building an image
+  * Fix user-mode net init flag on first time install
+  * bump c/common to v0.57.1
+  * bump version to v4.8.2-dev
+
 -------------------------------------------------------------------
 Thu Dec  7 08:43:26 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
 
diff --git a/podman.spec b/podman.spec
index de90bb5..7eb2908 100644
--- a/podman.spec
+++ b/podman.spec
@@ -19,7 +19,7 @@
 %{!?_user_tmpfilesdir: %global _user_tmpfilesdir %{_datadir}/user-tmpfiles.d}
 %define project        github.com/containers/podman
 Name:           podman
-Version:        4.8.1
+Version:        4.8.2
 Release:        0
 Summary:        Daemon-less container engine for managing containers, pods and images
 License:        Apache-2.0