diff --git a/skopeo.spec b/skopeo.spec index 526bdff..ad3673f 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -13,25 +13,24 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %endif %global import_path github.com/containers/%{name} -#%%global branch release-1.4 -#%%global commit0 a44da449d35e4621e9993f406d5a4f98dd89965e -#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7}) +%global branch main +%global commit0 47b808275d0e41d1506b6993d497b9f28864bb88 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 Name: skopeo Version: 1.4.1 -Release: 1%{?dist} +Release: 0.1%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures ExclusiveArch: %{go_arches} -#%%if 0%%{?branch:1} -#Source0: https://%%{import_path}/tarball/%%{commit0}/%%{branch}-%%{shortcommit0}.tar.gz -#%%else -#Source0: https://%%{import_path}/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz -#%%endif -Source0: %{url}/archive/v%{version}.tar.gz +%if 0%{?branch:1} +Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz +%else +Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz +%endif BuildRequires: git-core BuildRequires: golang >= 1.16.6 BuildRequires: go-md2man @@ -63,12 +62,11 @@ Requires: openssl This package contains system tests for %{name} %prep -#%%if 0%{?branch:1} -#%%autosetup -Sgit -n containers-%{name}-%{shortcommit0} -#%%else -#%%autosetup -Sgit -n %{name}-%{commit0} -#%%endif -%autosetup -Sgit -n %{name}-%{version} +%if 0%{?branch:1} +%autosetup -Sgit -n containers-%{name}-%{shortcommit0} +%else +%autosetup -Sgit -n %{name}-%{commit0} +%endif sed -i 's/install-binary: bin\/%{name}/install-binary:/' Makefile sed -i 's/install-docs: docs/install-docs:/' Makefile @@ -123,6 +121,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Thu Sep 09 2021 Jindrich Novy - 1:1.4.1-0.1 +- update to the latest content of https://github.com/containers/skopeo/tree/main + (https://github.com/containers/skopeo/commit/47b8082) +- Related: #2000051 + * Fri Sep 03 2021 Jindrich Novy - 1:1.4.1-1 - rebuild with containers-common dep fixed - Related: #2000051 diff --git a/sources b/sources index bd201c8..3f8c56f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.4.1.tar.gz) = 71185f772293696a068ccbdf79b9452248a66123a6df3b6f9e4c475d8787ef2c72d3b95bd6efa23044dfcc884f92a7cb704328a6a258439f331fd7e5ac607c30 +SHA512 (main-47b8082.tar.gz) = 8b3aafba3cf138b4c6de6dfef1a7f6c447b3c77da90a6cb0a6fce8a5a0b43426bffbf4f1ff654bce493fec3d1c8712503447d085197507958c6c783aadfc6417