From cc0b032b702b9efeebe725b5e0c187b0f8e06a81cb3f6d391d058c7a6b8d1b02 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Thu, 27 Jun 2019 07:16:12 +0000
Subject: [PATCH] Accepting request 712228 from home:cyphar:docker

- Use %config(noreplace) for /etc/docker/daemon.json. bsc#1138920

OBS-URL: https://build.opensuse.org/request/show/712228
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=311
---
 docker.changes |  5 +++++
 docker.spec    | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docker.changes b/docker.changes
index 644445b..8bc77f9 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 27 07:12:57 UTC 2019 - Aleksa Sarai <asarai@suse.com>
+
+- Use %config(noreplace) for /etc/docker/daemon.json. bsc#1138920
+
 -------------------------------------------------------------------
 Fri Jun  7 08:36:17 UTC 2019 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/docker.spec b/docker.spec
index 394d9a4..859c099 100644
--- a/docker.spec
+++ b/docker.spec
@@ -469,17 +469,21 @@ getent group docker >/dev/null || groupadd -r docker
 %{_bindir}/docker
 %{_bindir}/dockerd
 %{_sbindir}/rcdocker
+%dir %{_localstatedir}/lib/docker/
+
 %{_unitdir}/%{realname}.service
 %if "%flavour" == "kubic"
 %dir %{_unitdir}/%{realname}.service.d/
 %{_unitdir}/%{realname}.service.d/90-kubic.conf
 %endif
+
 %dir %{_sysconfdir}/docker
-%config %{_sysconfdir}/docker/daemon.json
+%config(noreplace) %{_sysconfdir}/docker/daemon.json
+%{_fillupdir}/sysconfig.docker
+
 %config %{_sysconfdir}/audit/rules.d/%{realname}.rules
 %{_udevrulesdir}/80-%{realname}.rules
-%{_fillupdir}/sysconfig.docker
-%dir %{_localstatedir}/lib/docker/
+
 %{_mandir}/man1/docker-*.1%{ext_man}
 %{_mandir}/man1/docker.1%{ext_man}
 %{_mandir}/man5/Dockerfile.5%{ext_man}