diff --git a/.gitignore b/.gitignore
index 24fd5fe..5856230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /cli-18.09.6.tar.gz
 /cli-19.03.0-rc3.tar.gz
 /cli-19.03.5.tar.gz
+/cli-19.03.12.tar.gz
diff --git a/0001-Added-transforms-for-compose-overrides.patch b/0001-Added-transforms-for-compose-overrides.patch
index b5864d0..ee99547 100644
--- a/0001-Added-transforms-for-compose-overrides.patch
+++ b/0001-Added-transforms-for-compose-overrides.patch
@@ -22,7 +22,7 @@ diff --git a/cli/compose/loader/merge.go b/cli/compose/loader/merge.go
 index 015b1f5a55..0de8d8a1b6 100644
 --- a/cli/compose/loader/merge.go
 +++ b/cli/compose/loader/merge.go
-@@ -57,6 +57,8 @@ func mergeServices(base, override []types.ServiceConfig) ([]types.ServiceConfig,
+@@ -57,6 +57,8 @@ func mergeServices(base, override []type
  			reflect.TypeOf([]types.ServicePortConfig{}):      mergeSlice(toServicePortConfigsMap, toServicePortConfigsSlice),
  			reflect.TypeOf([]types.ServiceSecretConfig{}):    mergeSlice(toServiceSecretConfigsMap, toServiceSecretConfigsSlice),
  			reflect.TypeOf([]types.ServiceConfigObjConfig{}): mergeSlice(toServiceConfigObjConfigsMap, toSServiceConfigObjConfigsSlice),
@@ -31,7 +31,7 @@ index 015b1f5a55..0de8d8a1b6 100644
  		},
  	}
  	for name, overrideService := range overrideServices {
-@@ -201,6 +203,28 @@ func mergeLoggingConfig(dst, src reflect.Value) error {
+@@ -201,6 +203,28 @@ func mergeLoggingConfig(dst, src reflect
  	return nil
  }
  
@@ -73,10 +73,10 @@ index 178d302da2..5055c68dba 100644
  
  	"github.com/docker/cli/cli/compose/types"
 +	"github.com/imdario/mergo"
- 	"gotest.tools/assert"
+ 	"gotest.tools/v3/assert"
  )
  
-@@ -1014,3 +1016,94 @@ func TestLoadMultipleNetworks(t *testing.T) {
+@@ -1014,3 +1016,94 @@ func TestLoadMultipleNetworks(t *testing
  		Configs: map[string]types.ConfigObjConfig{},
  	}, config)
  }
diff --git a/golang-github-docker-cli.spec b/golang-github-docker-cli.spec
index 2c287ac..a18796a 100644
--- a/golang-github-docker-cli.spec
+++ b/golang-github-docker-cli.spec
@@ -4,7 +4,7 @@
 
 # https://github.com/docker/cli
 %global goipath         github.com/docker/cli
-Version:                19.03.5
+Version:                19.03.12
 
 %gometa
 
@@ -24,7 +24,7 @@ products.}
                         examples docs
 
 Name:           %{goname}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        The docker CLI
 
 # Upstream license specification: Apache-2.0
@@ -170,12 +170,12 @@ BuildRequires:  golang(golang.org/x/sys/unix)
 BuildRequires:  golang(golang.org/x/text/width)
 BuildRequires:  golang(golang.org/x/time/rate)
 BuildRequires:  golang(gopkg.in/yaml.v2)
-BuildRequires:  golang(gotest.tools/assert)
-BuildRequires:  golang(gotest.tools/assert/cmp)
-BuildRequires:  golang(gotest.tools/fs)
-BuildRequires:  golang(gotest.tools/icmd)
-BuildRequires:  golang(gotest.tools/poll)
-BuildRequires:  golang(gotest.tools/skip)
+BuildRequires:  golang(gotest.tools/v3/assert)
+BuildRequires:  golang(gotest.tools/v3/assert/cmp)
+BuildRequires:  golang(gotest.tools/v3/fs)
+BuildRequires:  golang(gotest.tools/v3/icmd)
+BuildRequires:  golang(gotest.tools/v3/poll)
+BuildRequires:  golang(gotest.tools/v3/skip)
 BuildRequires:  golang(k8s.io/api/apps/v1beta2)
 BuildRequires:  golang(k8s.io/api/core/v1)
 BuildRequires:  golang(k8s.io/apimachinery/pkg/api/errors)
@@ -201,8 +201,8 @@ BuildRequires:  golang(vbom.ml/util/sortorder)
 BuildRequires:  golang(github.com/containerd/containerd/cio)
 BuildRequires:  golang(github.com/google/go-cmp/cmp)
 BuildRequires:  golang(github.com/google/go-cmp/cmp/cmpopts)
-BuildRequires:  golang(gotest.tools/env)
-BuildRequires:  golang(gotest.tools/golden)
+BuildRequires:  golang(gotest.tools/v3/env)
+BuildRequires:  golang(gotest.tools/v3/golden)
 BuildRequires:  golang(k8s.io/apimachinery/pkg/labels)
 BuildRequires:  golang(k8s.io/apimachinery/pkg/runtime/serializer)
 BuildRequires:  golang(k8s.io/apimachinery/pkg/types)
@@ -219,7 +219,7 @@ BuildRequires:  golang(k8s.io/client-go/testing)
 %prep
 %goprep
 %autopatch -p1
-find . -name "*.go" -exec sed -i "s|github.com/flynn-archive/go-shlex|github.com/google/shlex|" "{}" +;
+sed -i "s|github.com/flynn-archive/go-shlex|github.com/google/shlex|" $(find . -name "*.go")
 
 # %%build
 # for cmd in cmd/* ; do
@@ -234,16 +234,10 @@ find . -name "*.go" -exec sed -i "s|github.com/flynn-archive/go-shlex|github.com
 %%if %{with check}
 %check
 %gocheck -t cmd \
-         -d cli/command/image \
-         -d cli/command/container \
-         -d cli/command/engine \
-         -d cli/command/formatter \
-         -d cli/command/node \
-         -d cli/command/plugin \
-         -d cli/command/registry \
-         -d cli/command/stack \
-         -d cli/command/system \
-         -d cli/command/trust
+         -t cli/command \
+         -t cli/context \
+         -d internal/containerizedengine \
+         -t kubernetes
 %endif
 
 # %%files
@@ -254,6 +248,9 @@ find . -name "*.go" -exec sed -i "s|github.com/flynn-archive/go-shlex|github.com
 %gopkgfiles
 
 %changelog
+* Sat Jul 25 22:24:04 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 19.03.12-1
+- Update to 19.03.12
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.03.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 0faa9d9..6dbef9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cli-19.03.5.tar.gz) = 46d90301a84bc8b8cf7ca54f0cc4ec8553dce6469b03a9ea2cd947dd5f38bd17ca2120fa92a14272f1a46cd0e661813322cbc54c6d9675da211991fcf0b979e0
+SHA512 (cli-19.03.12.tar.gz) = 3114ba5134d8606393c526d9d780cae4ca8584017c734a49250be43eb84ab9c716c30735d04b33a1ef47475b06b31f269f4a020ac1b6647b58504acb9fed8be6