From b42e51bd45bc769fd60509c61f95db9f4bc00faf7d2ea2bcd3e7e6522018b48e Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Fri, 7 Jul 2023 21:34:35 +0000
Subject: [PATCH] Accepting request 1097634 from home:cyphar:docker

- Update to Docker 24.0.4-ce. See upstream changelog online at
  <https://docs.docker.com/engine/release-notes/24.0/#2404>.

OBS-URL: https://build.opensuse.org/request/show/1097634
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=391
---
 _service                             | 8 ++++----
 docker-24.0.3_ce_1d9c8619cded.tar.xz | 3 ---
 docker-24.0.4_ce_4ffc61430bbe.tar.xz | 3 +++
 docker-cli-24.0.3_ce.tar.xz          | 3 ---
 docker-cli-24.0.4_ce.tar.xz          | 3 +++
 docker.changes                       | 6 ++++++
 docker.spec                          | 6 +++---
 7 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 docker-24.0.3_ce_1d9c8619cded.tar.xz
 create mode 100644 docker-24.0.4_ce_4ffc61430bbe.tar.xz
 delete mode 100644 docker-cli-24.0.3_ce.tar.xz
 create mode 100644 docker-cli-24.0.4_ce.tar.xz

diff --git a/_service b/_service
index 0dedea5..ee40fbb 100644
--- a/_service
+++ b/_service
@@ -3,16 +3,16 @@
     <param name="url">https://github.com/moby/moby.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">24.0.3_ce_%h</param>
-    <param name="revision">v24.0.3</param>
+    <param name="versionformat">24.0.4_ce_%h</param>
+    <param name="revision">v24.0.4</param>
     <param name="filename">docker</param>
   </service>
   <service name="tar_scm" mode="disabled">
     <param name="url">https://github.com/docker/cli.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">24.0.3_ce</param>
-    <param name="revision">v24.0.3</param>
+    <param name="versionformat">24.0.4_ce</param>
+    <param name="revision">v24.0.4</param>
     <param name="filename">docker-cli</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/docker-24.0.3_ce_1d9c8619cded.tar.xz b/docker-24.0.3_ce_1d9c8619cded.tar.xz
deleted file mode 100644
index b0e0a94..0000000
--- a/docker-24.0.3_ce_1d9c8619cded.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb31d9740b81ef49cfc7ee39c29700e21049709eb13a26782abdb81f4e5c6388
-size 8785508
diff --git a/docker-24.0.4_ce_4ffc61430bbe.tar.xz b/docker-24.0.4_ce_4ffc61430bbe.tar.xz
new file mode 100644
index 0000000..214e9d8
--- /dev/null
+++ b/docker-24.0.4_ce_4ffc61430bbe.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3afe8f4cc394ae9450dc649cdc1512a431c5d4fc645d01ce4cc7be74e34a4161
+size 8785084
diff --git a/docker-cli-24.0.3_ce.tar.xz b/docker-cli-24.0.3_ce.tar.xz
deleted file mode 100644
index 6d3df67..0000000
--- a/docker-cli-24.0.3_ce.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3048886d7d2aa51d890e188c79e23220fb8da00bba835c75f97eebb90ae2956b
-size 3513404
diff --git a/docker-cli-24.0.4_ce.tar.xz b/docker-cli-24.0.4_ce.tar.xz
new file mode 100644
index 0000000..a9ec2dc
--- /dev/null
+++ b/docker-cli-24.0.4_ce.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dcce35801136750e1815a689911b7363f518abe58c6c04d0839d2622bd31802
+size 3514396
diff --git a/docker.changes b/docker.changes
index 3f818bd..a3c585a 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  7 21:29:05 UTC 2023 - Aleksa Sarai <asarai@suse.com>
+
+- Update to Docker 24.0.4-ce. See upstream changelog online at
+  <https://docs.docker.com/engine/release-notes/24.0/#2404>.
+
 -------------------------------------------------------------------
 Fri Jul  7 02:35:02 UTC 2023 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/docker.spec b/docker.spec
index a44a465..cb5e6a8 100644
--- a/docker.spec
+++ b/docker.spec
@@ -31,9 +31,9 @@
 # helpfully injects into our build environment from the changelog). If you want
 # to generate a new git_commit_epoch, use this:
 #  $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s'
-%define real_version 24.0.3
-%define git_version 1d9c8619cded
-%define git_commit_epoch 1688392545
+%define real_version 24.0.4
+%define git_version 4ffc61430bbe
+%define git_commit_epoch 1688740946
 
 Name:           docker
 Version:        %{real_version}_ce