rpms/skopeo
7
0
Fork 0
Code Issues Pull Requests Releases Activity

skopeo-1.3.1-5.el9

Browse Source 
- handle CentOS Stream while updating vendored components
- Related: #1970747

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2021-07-05 12:20:06 +02:00
parent b71efbfccd
commit aa9d285e02
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
skopeo.spec
View File

@ -21,8 +21,8 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
# podman/skopeo/podman. # podman/skopeo/podman.
%global podman_branch master %global podman_branch master
%global image_branch v5.12.0 %global image_branch v5.12.0
%global common_branch v0.38.4 %global common_branch v0.38.12
%global storage_branch v1.31.1 %global storage_branch v1.31.3
%global shortnames_branch main %global shortnames_branch main
%global commit0 038f70e6f52ca354534b2d38ce9611b8fc5537c4 %global commit0 038f70e6f52ca354534b2d38ce9611b8fc5537c4
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
@ -30,7 +30,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
Epoch: 1 Epoch: 1
Name: skopeo Name: skopeo
Version: 1.3.1 Version: 1.3.1
Release: 4%{?dist} Release: 5%{?dist}
Summary: Inspect container images and repositories on registries Summary: Inspect container images and repositories on registries
License: ASL 2.0 License: ASL 2.0
URL: %{git0} URL: %{git0}
@ -241,6 +241,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%changelog %changelog
* Mon Jul 05 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-5
- handle CentOS Stream while updating vendored components
- Related: #1970747
* Mon Jul 05 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-4 * Mon Jul 05 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.3.1-4
- update to the latest content of https://github.com/containers/skopeo/tree/release-1.3 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.3
(https://github.com/containers/skopeo/commit/038f70e) (https://github.com/containers/skopeo/commit/038f70e)

6
update-vendored.sh
View File

@ -5,13 +5,17 @@
set -xe set -xe
rm -f /tmp/ver_image /tmp/ver_common /tmp/ver_storage rm -f /tmp/ver_image /tmp/ver_common /tmp/ver_storage
B=`pkg switch-branch | grep ^* | cut -d\ -f2` B=`pkg switch-branch | grep ^* | cut -d\ -f2`
git branch | grep c9s > /dev/null
if [ $? == 0 ]; then
B=c9s
fi
echo $B echo $B
for P in podman skopeo buildah; do for P in podman skopeo buildah; do
BRN=`pwd | sed 's,^.*/,,'` BRN=`pwd | sed 's,^.*/,,'`
rm -rf $P rm -rf $P
pkg clone $P pkg clone $P
cd $P cd $P
pkg switch-branch $B [ $B != c9s ] && pkg switch-branch $B
if [ $BRN != stream-container-tools-rhel8 ]; then if [ $BRN != stream-container-tools-rhel8 ]; then
pkg prep pkg prep
else else