From 17f06290a9937f27802d4d215ed13052e8a35738 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Tue, 15 Jun 2021 08:21:33 +0200
Subject: [PATCH] skopeo-1.3.0-6.el9

- set short-names-mode = "enforcing" in registries.conf
- Resolves: #1971752

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 containers.conf | 1 -
 registries.conf | 1 +
 skopeo.spec     | 6 +++++-
 update.sh       | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/containers.conf b/containers.conf
index 76cc72d..a99c6da 100644
--- a/containers.conf
+++ b/containers.conf
@@ -498,4 +498,3 @@ runtime = "crun"
 # TOML does not provide a way to end a table other than a further table being
 # defined, so every key hereafter will be part of [volume_plugins] and not the
 # main config.
-short-names-mode = "enforcing"
diff --git a/registries.conf b/registries.conf
index 6836f99..4a82bbc 100644
--- a/registries.conf
+++ b/registries.conf
@@ -111,3 +111,4 @@ unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.
 # # 2. example-mirror-1.local/mirrors/foo/image:latest
 # # 3. internal-registry-for-example.net/bar/myimage:latest
 # # in order, and use the first one that exists.
+short-names-mode = "enforcing"
diff --git a/skopeo.spec b/skopeo.spec
index b2f09eb..e136347 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -30,7 +30,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 Epoch: 1
 Name: skopeo
 Version: 1.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -241,6 +241,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Tue Jun 15 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-6
+- set short-names-mode = "enforcing" in registries.conf
+- Resolves: #1971752
+
 * Mon Jun 14 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-5
 - configure for RHEL9
 - Related: #1970747
diff --git a/update.sh b/update.sh
index 5c5f988..63c7c85 100755
--- a/update.sh
+++ b/update.sh
@@ -24,10 +24,10 @@ spectool -f -g skopeo.spec
 ensure storage.conf    driver                        \"overlay\"
 ensure storage.conf    mountopt                      \"nodev,metacopy=on\"
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"quay.io\",\ \"docker.io\"]
+ensure registries.conf short-names-mode              \"enforcing\"
 ensure containers.conf events_logger                 \"file\"
 ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi9/pause\"
 ensure containers.conf runtime                       \"crun\"
-ensure containers.conf short-names-mode              \"enforcing\"
 [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
 				"keyctl",' seccomp.json
 sed -i '/\"socketcall\",/i \