From 5ff6196336064e1638ad47fd0b7c25419bf8befe9680046df4c1a1b4764ff6da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Fri, 6 Oct 2023 06:45:01 +0000
Subject: [PATCH] Accepting request 1115956 from
 home:danishprakash:branches:devel:microos

podman-docker: Provides docker to avoid conflicts (bsc#1215926)
Update to version 4.7.1

OBS-URL: https://build.opensuse.org/request/show/1115956
OBS-URL: https://build.opensuse.org/package/show/devel:microos/podman?expand=0&rev=34
---
 _service            |  2 +-
 _servicedata        |  2 +-
 podman-4.7.0.tar.xz |  3 ---
 podman-4.7.1.tar.xz |  3 +++
 podman.changes      | 18 ++++++++++++++++++
 podman.spec         |  3 ++-
 6 files changed, 25 insertions(+), 6 deletions(-)
 delete mode 100644 podman-4.7.0.tar.xz
 create mode 100644 podman-4.7.1.tar.xz

diff --git a/_service b/_service
index be715cb..9498711 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.7.0</param>
+    <param name="revision">v4.7.1</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 838df1a..8fee2ac 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">073183fe1723d7bda826b574437891976a958c65</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">ef83eeb9c7482826672f3efa12db3d61c88df6c4</param></service></servicedata>
\ No newline at end of file
diff --git a/podman-4.7.0.tar.xz b/podman-4.7.0.tar.xz
deleted file mode 100644
index 7385687..0000000
--- a/podman-4.7.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06e24b3a03b18d2be618e03b6193663d9d156287a1279b00dcf2cdc157df7021
-size 12798244
diff --git a/podman-4.7.1.tar.xz b/podman-4.7.1.tar.xz
new file mode 100644
index 0000000..7cf73ca
--- /dev/null
+++ b/podman-4.7.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf80e4a0fcbb177402c78247284d1ef17073b6a176ee6a01b6d91f49254f4016
+size 12795776
diff --git a/podman.changes b/podman.changes
index 093ea17..295a730 100644
--- a/podman.changes
+++ b/podman.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Oct 06 05:50:25 UTC 2023 - danish.prakash@suse.com
+
+- podman-docker: Provides docker to avoid conflicts
+  when using podman with docker-compose (bsc#1215926)
+- Update to version 4.7.1:
+  * New version: v4.7.1
+  * Update RELEASE_NOTES.md for v4.7.1
+  * compat API: speed up network list
+  * inspect: ignore ENOENT during device lookup
+  * test/system: --env-file test fixes
+  * Revert "feat(env): support multiline in env-file"
+  * Revert "docs(env-file): improve document description"
+  * Revert "fix(env): parsing --env incorrect in cli"
+  * [CI:DOCS] update swagger version on docs.podman.io
+  * Fix locale issues with WSL version detection
+  * switch version to 4.7.1-dev
+
 -------------------------------------------------------------------
 Fri Sep 29 03:21:32 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
 
diff --git a/podman.spec b/podman.spec
index 2edc534..6f6714b 100644
--- a/podman.spec
+++ b/podman.spec
@@ -18,7 +18,7 @@
 %{!?_user_tmpfilesdir: %global _user_tmpfilesdir %{_datadir}/user-tmpfiles.d}
 %define project        github.com/containers/podman
 Name:           podman
-Version:        4.7.0
+Version:        4.7.1
 Release:        0
 Summary:        Daemon-less container engine for managing containers, pods and images
 License:        Apache-2.0
@@ -101,6 +101,7 @@ Conflicts:      docker-ce
 Conflicts:      docker-ee
 Conflicts:      docker-latest
 Conflicts:      moby-engine
+Provides:       docker
 
 %description docker
 This package installs a script named docker that emulates the Docker CLI by