From a49b9cc5513e23f72c459ae3156a4355cc87cb50 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 11:49:44 +0000 Subject: [PATCH] import CS skopeo-1.14.3-0.1.el9 --- .gitignore | 2 +- .skopeo.metadata | 2 +- SPECS/skopeo.spec | 37 +++++++++++++++++++++++++++++++------ 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index cf203a2..7a00b2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/skopeo-1.13.3-9e29e4c.tar.gz +SOURCES/release-1.14-1c2ab99.tar.gz diff --git a/.skopeo.metadata b/.skopeo.metadata index 73ab69e..e2c705b 100644 --- a/.skopeo.metadata +++ b/.skopeo.metadata @@ -1 +1 @@ -758a95f4018d4d005a3011d4d5cca702073e0d55 SOURCES/skopeo-1.13.3-9e29e4c.tar.gz +bf4ae6b3d4c10b01d8b5f0ea52ad0afdf59b3227 SOURCES/release-1.14-1c2ab99.tar.gz diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index 00cf622..249e8f0 100644 --- a/SPECS/skopeo.spec +++ b/SPECS/skopeo.spec @@ -8,14 +8,14 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %endif %global import_path github.com/containers/%{name} -#%%global branch release-1.11 -%global commit0 9e29e4cede9bdaa4a54aa5b0af86efedb823bde4 +%global branch release-1.14 +%global commit0 1c2ab995059dd011aad74e2c37305d636ebd2675 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: skopeo -Version: 1.13.3 -Release: 1%{?dist} +Version: 1.14.3 +Release: 0.1%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -27,7 +27,7 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif BuildRequires: git-core -BuildRequires: golang >= 1.16.6 +BuildRequires: golang >= 1.20.10 BuildRequires: /usr/bin/go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel @@ -47,7 +47,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} #Requires: bats (which RHEL8 doesn't have. If it ever does, un-comment this) Requires: gnupg Requires: jq -Requires: golang +Requires: golang >= 1.20.10 Requires: podman Requires: crun Requires: httpd-tools @@ -124,6 +124,31 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Fri Feb 02 2024 Jindrich Novy - 2:1.14.3-0.1 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 + (https://github.com/containers/skopeo/commit/1c2ab99) +- Related: RHEL-2112 + +* Wed Jan 31 2024 Jindrich Novy - 2:1.14.1-2 +- Switch to the maint branch +- Related: Jira:RHEL-2112 + +* Fri Jan 19 2024 Jindrich Novy - 2:1.14.1-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.14.1 +- Related: RHEL-2112 + +* Wed Dec 06 2023 Lokesh Mandvekar - 2:1.14.0-1 +- bump to v1.14.0 +- Related: Jira:RHEL-2112 + +* Fri Dec 01 2023 Lokesh Mandvekar - 2:1.13.3-3 +- Rebuild with golang 1.20.10 +- Related: Jira:RHEL-2786 + +* Fri Dec 01 2023 Lokesh Mandvekar - 2:1.13.3-2 +- Rebuild with golang 1.21.3 +- Related: Jira:RHEL-2786 + * Fri Aug 25 2023 Jindrich Novy - 2:1.13.3-1 - update to https://github.com/containers/skopeo/releases/tag/v1.13.3 - Related: #2176063