From 3b13726bc42ab225b3cb96081f29eb169a06fe95 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Wed, 7 Jul 2021 11:19:08 +0200
Subject: [PATCH] skopeo-1.3.1-6.el9

- correct name of the option is "short-name-mode" not "short-names-mode"
- Related: #1970747

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

diff --git a/registries.conf b/registries.conf
index f9626f8..5337fd8 100644
--- a/registries.conf
+++ b/registries.conf
@@ -76,4 +76,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/image:latest
 # # in order, and use the first one that exists.
-short-names-mode = "enforcing"
+short-name-mode = "enforcing"
diff --git a/skopeo.spec b/skopeo.spec
index 97a7e9c..0f075d9 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.1
-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
+* Wed Jul 07 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-6
+- correct name of the option is "short-name-mode" not "short-names-mode"
+- Related: #1970747
+
 * Mon Jul 05 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-5
 - handle CentOS Stream while updating vendored components
 - Related: #1970747
diff --git a/update.sh b/update.sh
index 63c7c85..54cb549 100755
--- a/update.sh
+++ b/update.sh
@@ -24,7 +24,7 @@ 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 registries.conf short-name-mode               \"enforcing\"
 ensure containers.conf events_logger                 \"file\"
 ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi9/pause\"
 ensure containers.conf runtime                       \"crun\"