From 6d5ad5d2222b01c8256211c88320d4f810d7bc85 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Tue, 3 Aug 2021 11:03:40 +0200
Subject: [PATCH] skopeo-1.4.0-1.el9

- update to 1.4.0 release and switch to the release-1.4 maint branch
- Related: #1970747

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 skopeo.spec | 10 +++++++---
 sources     |  1 +
 update.sh   |  4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/skopeo.spec b/skopeo.spec
index c8bd008..74c37de 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -13,13 +13,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %endif
 
 %global import_path github.com/containers/skopeo
-%global branch main
+%global branch release-1.4
 # Bellow definitions are used to deliver config files from a particular branch
 # of c/image, c/common, c/storage vendored in all podman, skopeo, buildah.
 # These vendored components must have the same version. If it is not the case,
 # pick the oldest version on c/image, c/common, c/storage vendored in
 # podman/skopeo/podman.
-%global podman_branch master
+%global podman_branch v3.3
 %global image_branch v5.14.0
 %global common_branch v0.41.0
 %global storage_branch v1.33.0
@@ -30,7 +30,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 Epoch: 1
 Name: skopeo
 Version: 1.4.0
-Release: 0.2%{?dist}
+Release: 1%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -263,6 +263,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Tue Aug 03 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-1
+- update to 1.4.0 release and switch to the release-1.4 maint branch
+- Related: #1970747
+
 * Mon Aug 02 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-0.2
 - update vendored components
 - ship /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release only on non-RHEL and
diff --git a/sources b/sources
index 81dddbf..f70aa08 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (main-caf1469.tar.gz) = be3db2ff0373b9fc330fa308920f60b68a150ab171cffe51dc940154163439e9ef86066bcfa357a522b982d2d8715339dfe24ce3f01eb4b1cf23244eeb6bb9c8
+SHA512 (release-1.4-caf1469.tar.gz) = be3db2ff0373b9fc330fa308920f60b68a150ab171cffe51dc940154163439e9ef86066bcfa357a522b982d2d8715339dfe24ce3f01eb4b1cf23244eeb6bb9c8
diff --git a/update.sh b/update.sh
index 54cb549..f033841 100755
--- a/update.sh
+++ b/update.sh
@@ -18,8 +18,8 @@ $2 = $3" $1
   fi
 }
 
-./pyxis.sh
-./update-vendored.sh
+#./pyxis.sh
+#./update-vendored.sh
 spectool -f -g skopeo.spec
 ensure storage.conf    driver                        \"overlay\"
 ensure storage.conf    mountopt                      \"nodev,metacopy=on\"