diff --git a/.gitignore b/.gitignore index bc26e41..c8d345a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /skopeo-dd2c3e3.tar.gz /skopeo-7fd6f66.tar.gz /skopeo-2e8377a.tar.gz +/skopeo-93876ac.tar.gz diff --git a/skopeo.spec b/skopeo.spec index a6bc674..0524de8 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{import_path} -%global commit0 2e8377a7085c13674be156f32c100708da838b7e +%global commit0 93876acc5ef7ecfc79bdd6852013a49901c54591 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -37,7 +37,7 @@ Name: %{repo} %if 0%{?centos} Epoch: 1 %endif # centos -Version: 0.1.26 +Version: 0.1.27 Release: 1.git%{shortcommit0}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 @@ -178,8 +178,8 @@ providing packages with %{import_path} prefix. %package containers Summary: Configuration files for working with image signatures -Conflicts: atomic <= 1.13.1-2 -Conflicts: docker-rhsubscription <= 2:1.13.1-31 +obsoletes: atomic <= 1.13.1-2 +obsoletes: docker-rhsubscription <= 2:1.13.1-31 %description containers This package installs a default signature store configuration and a default @@ -306,6 +306,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name} %changelog +* Tue Nov 21 2017 dwalsh - 0.1.27-1.git +- Fix Conflicts to Obsoletes +- Add better docs to man pages. +- Use credentials from authfile for skopeo commands +- Support storage="" in /etc/containers/storage.conf +- Add global --override-arch and --override-os options + * Wed Nov 15 2017 dwalsh - 0.1.25-2.git2e8377a7 - Add manifest type conversion to skopeo copy - User can select from 3 manifest types: oci, v2s1, or v2s2 diff --git a/sources b/sources index 8a9ffeb..2ecd9b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-2e8377a.tar.gz) = 490f3c30138d412d4e0585edc1a1a80a1ece47e052f5bc782ca68c7727c6200c648b631bdb5d60214c9934d8807ca745750182eb485d037846e2a4871eb59e2a +SHA512 (skopeo-93876ac.tar.gz) = 63eeaf95a00f27630b2e92f6b5c198e096e914d6e89e8cf4891a322e8019a55162356e6701a0e4dd61501e980c1912f411468913ab11054c2ac9bf9c04d71664