The package rpms/skopeo.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/skopeo.git/commit/?id=91ba3c41657b2b... https://src.fedoraproject.org/cgit/rpms/skopeo.git/commit/?id=2abb4e7e66259e....
Change: +ExclusiveArch: %{?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}}%{!?go_arches:%{ix86} x86_64 %{arm}} -ExclusiveArch: %{?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change: ============
commit 68ebed58d778d422b097b2ebda3d3e4a21e50eea Author: Daniel J Walsh dwalsh@redhat.com Date: Mon Aug 21 10:59:48 2017 +0000
foo
diff --git a/skopeo.spec b/skopeo.spec index db6e6c6..652f1b1 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -37,11 +37,7 @@ Name: skopeo Epoch: 1 %endif # centos Version: 0.1.23 -<<<<<<< HEAD Release: 6.git%{shortcommit}%{?dist} -======= -Release: 2.git%{shortcommit}%{?dist} ->>>>>>> 809d79a0d935880447881b73fcb1b2b814344067 Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -215,11 +211,7 @@ make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_sysconfdir} install -m0644 %SOURCE1 %{buildroot}%{_sysconfdir}/containers/storage.conf mkdir -p %{buildroot}%{_mandir}/man5 -<<<<<<< HEAD go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5 -======= -go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.5 ->>>>>>> 809d79a0d935880447881b73fcb1b2b814344067
# source codes for building projects %if 0%{?with_devel} @@ -284,11 +276,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/containers/storage.conf %dir %{_sharedstatedir}/atomic/sigstore -<<<<<<< HEAD %{_mandir}/man5/containers-storage.conf.5* -======= -%{_mandir}/man5/storage.conf.5* ->>>>>>> 809d79a0d935880447881b73fcb1b2b814344067
%files %license LICENSE @@ -300,7 +288,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog -<<<<<<< HEAD * Mon Aug 21 2017 dwalsh dwalsh@redhat.com - 0.1.23-6.dev.git1bbd87 - Change name of storage.conf.5 man page to containers-storage.conf.5, since it conflicts with inn package @@ -316,8 +303,6 @@ it conflicts with inn package * Thu Jul 27 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.23-3.git1bbd87f - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-======= ->>>>>>> 809d79a0d935880447881b73fcb1b2b814344067 * Tue Jul 24 2017 dwalsh dwalsh@redhat.com - 0.1.23-2.dev.git1bbd87 - Fix storage.conf man page to be storage.conf.5.gz so that it works.
diff --git a/storage.conf b/storage.conf index 5ce7192..92cfd8a 100644 --- a/storage.conf +++ b/storage.conf @@ -1,19 +1,12 @@ -<<<<<<< HEAD # storage.conf is the configuration file for all tools # that share the containers/storage libraries # See man 5 containers-storage.conf for more information
-======= ->>>>>>> 809d79a0d935880447881b73fcb1b2b814344067 # The "container storage" table contains all of the server options. [storage]
# Default Storage Driver -<<<<<<< HEAD driver = "" -======= -driver = "overlay" ->>>>>>> 809d79a0d935880447881b73fcb1b2b814344067
# Temporary storage location runroot = "/var/run/containers/storage"
commit 1684923c68e874c23c7ed14f03c10806e581694e Merge: ebf6bfb 809d79a Author: Daniel J Walsh dwalsh@redhat.com Date: Mon Aug 21 10:59:28 2017 +0000
Merge branch 'f26' of ssh://pkgs.fedoraproject.org/rpms/skopeo into f26
diff --cc skopeo.spec index 652f1b1,1466d26..db6e6c6 --- a/skopeo.spec +++ b/skopeo.spec @@@ -37,7 -37,7 +37,11 @@@ Name: skope Epoch: 1 %endif # centos Version: 0.1.23 ++<<<<<<< HEAD +Release: 6.git%{shortcommit}%{?dist} ++======= + Release: 2.git%{shortcommit}%{?dist} ++>>>>>>> 809d79a0d935880447881b73fcb1b2b814344067 Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@@ -211,7 -211,7 +215,11 @@@ make DESTDIR=%{buildroot} instal mkdir -p %{buildroot}%{_sysconfdir} install -m0644 %SOURCE1 %{buildroot}%{_sysconfdir}/containers/storage.conf mkdir -p %{buildroot}%{_mandir}/man5 ++<<<<<<< HEAD +go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5 ++======= + go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.5 ++>>>>>>> 809d79a0d935880447881b73fcb1b2b814344067
# source codes for building projects %if 0%{?with_devel} @@@ -276,7 -276,7 +284,11 @@@ export GOPATH=%{buildroot}/%{gopath}:$( %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/containers/storage.conf %dir %{_sharedstatedir}/atomic/sigstore ++<<<<<<< HEAD +%{_mandir}/man5/containers-storage.conf.5* ++======= + %{_mandir}/man5/storage.conf.5* ++>>>>>>> 809d79a0d935880447881b73fcb1b2b814344067
%files %license LICENSE @@@ -288,21 -288,6 +300,24 @@@ %{_datadir}/bash-completion/completions/%{name}
%changelog ++<<<<<<< HEAD +* Mon Aug 21 2017 dwalsh dwalsh@redhat.com - 0.1.23-6.dev.git1bbd87 +- Change name of storage.conf.5 man page to containers-storage.conf.5, since +it conflicts with inn package +- Also remove default to "overalay" in the configuration, since we should +- allow containers storage to pick the best default for the platform. + +* Thu Aug 03 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.23-5.git1bbd87f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Sun Jul 30 2017 Florian Weimer fweimer@redhat.com - 0.1.23-4.git1bbd87f +- Rebuild with binutils fix for ppc64le (#1475636) + +* Thu Jul 27 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.23-3.git1bbd87f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + ++======= ++>>>>>>> 809d79a0d935880447881b73fcb1b2b814344067 * Tue Jul 24 2017 dwalsh dwalsh@redhat.com - 0.1.23-2.dev.git1bbd87 - Fix storage.conf man page to be storage.conf.5.gz so that it works.
diff --cc storage.conf index 92cfd8a,519a0ab..5ce7192 --- a/storage.conf +++ b/storage.conf @@@ -1,12 -1,8 +1,19 @@@ ++<<<<<<< HEAD +# storage.conf is the configuration file for all tools +# that share the containers/storage libraries +# See man 5 containers-storage.conf for more information + ++======= ++>>>>>>> 809d79a0d935880447881b73fcb1b2b814344067 # The "container storage" table contains all of the server options. [storage]
# Default Storage Driver ++<<<<<<< HEAD +driver = "" ++======= + driver = "overlay" ++>>>>>>> 809d79a0d935880447881b73fcb1b2b814344067
# Temporary storage location runroot = "/var/run/containers/storage"
commit ebf6bfbb6a8bc0cf28aca62f50a9c432e9ad2051 Merge: 4ff6a6a d56663e Author: Daniel J Walsh dwalsh@redhat.com Date: Mon Aug 21 10:59:14 2017 +0000
Merge branch 'f25' of ssh://pkgs.fedoraproject.org/rpms/skopeo into f26
commit d56663e9e80aeaaa9ecc49573591c6d2ed3b5cb0 Author: Daniel J Walsh dwalsh@redhat.com Date: Mon Aug 21 10:16:26 2017 +0000
Change name of storage.conf.5 man page to containers-storage.conf.5, since it conflicts with inn package Also remove default to "overalay" in the configuration, since we should allow containers storage to pick the best default for the platform.
diff --git a/skopeo.spec b/skopeo.spec index 1466d26..652f1b1 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -37,7 +37,7 @@ Name: skopeo Epoch: 1 %endif # centos Version: 0.1.23 -Release: 2.git%{shortcommit}%{?dist} +Release: 6.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -211,7 +211,7 @@ make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_sysconfdir} install -m0644 %SOURCE1 %{buildroot}%{_sysconfdir}/containers/storage.conf mkdir -p %{buildroot}%{_mandir}/man5 -go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.5 +go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5
# source codes for building projects %if 0%{?with_devel} @@ -276,7 +276,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/containers/storage.conf %dir %{_sharedstatedir}/atomic/sigstore -%{_mandir}/man5/storage.conf.5* +%{_mandir}/man5/containers-storage.conf.5*
%files %license LICENSE @@ -288,6 +288,21 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Mon Aug 21 2017 dwalsh dwalsh@redhat.com - 0.1.23-6.dev.git1bbd87 +- Change name of storage.conf.5 man page to containers-storage.conf.5, since +it conflicts with inn package +- Also remove default to "overalay" in the configuration, since we should +- allow containers storage to pick the best default for the platform. + +* Thu Aug 03 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.23-5.git1bbd87f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Sun Jul 30 2017 Florian Weimer fweimer@redhat.com - 0.1.23-4.git1bbd87f +- Rebuild with binutils fix for ppc64le (#1475636) + +* Thu Jul 27 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.23-3.git1bbd87f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jul 24 2017 dwalsh dwalsh@redhat.com - 0.1.23-2.dev.git1bbd87 - Fix storage.conf man page to be storage.conf.5.gz so that it works.
diff --git a/storage.conf b/storage.conf index 519a0ab..92cfd8a 100644 --- a/storage.conf +++ b/storage.conf @@ -1,8 +1,12 @@ +# storage.conf is the configuration file for all tools +# that share the containers/storage libraries +# See man 5 containers-storage.conf for more information + # The "container storage" table contains all of the server options. [storage]
# Default Storage Driver -driver = "overlay" +driver = ""
# Temporary storage location runroot = "/var/run/containers/storage"
commit 4ff6a6a1cd75e512f8e403ffdb4262fff0b13406 Author: Daniel J Walsh dwalsh@redhat.com Date: Mon Aug 21 10:10:48 2017 +0000
Change name of storage.conf.5 man page to containers-storage.conf.5, since it conflicts with inn package Also remove default to "overalay" in the configuration, since we should allow containers storage to pick the best default for the platform.
diff --git a/skopeo.spec b/skopeo.spec index 39ef4a6..652f1b1 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -37,7 +37,7 @@ Name: skopeo Epoch: 1 %endif # centos Version: 0.1.23 -Release: 5.git%{shortcommit}%{?dist} +Release: 6.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -211,7 +211,7 @@ make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_sysconfdir} install -m0644 %SOURCE1 %{buildroot}%{_sysconfdir}/containers/storage.conf mkdir -p %{buildroot}%{_mandir}/man5 -go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.5 +go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5
# source codes for building projects %if 0%{?with_devel} @@ -276,7 +276,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/containers/storage.conf %dir %{_sharedstatedir}/atomic/sigstore -%{_mandir}/man5/storage.conf.5* +%{_mandir}/man5/containers-storage.conf.5*
%files %license LICENSE @@ -288,6 +288,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Mon Aug 21 2017 dwalsh dwalsh@redhat.com - 0.1.23-6.dev.git1bbd87 +- Change name of storage.conf.5 man page to containers-storage.conf.5, since +it conflicts with inn package +- Also remove default to "overalay" in the configuration, since we should +- allow containers storage to pick the best default for the platform. + * Thu Aug 03 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.23-5.git1bbd87f - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/storage.conf b/storage.conf index 519a0ab..92cfd8a 100644 --- a/storage.conf +++ b/storage.conf @@ -1,8 +1,12 @@ +# storage.conf is the configuration file for all tools +# that share the containers/storage libraries +# See man 5 containers-storage.conf for more information + # The "container storage" table contains all of the server options. [storage]
# Default Storage Driver -driver = "overlay" +driver = ""
# Temporary storage location runroot = "/var/run/containers/storage"
commit cacf481841fe8b74e329b5af2edd2d431546b659 Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Aug 3 08:32:29 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/skopeo.spec b/skopeo.spec index ee3f8e8..39ef4a6 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -37,7 +37,7 @@ Name: skopeo Epoch: 1 %endif # centos Version: 0.1.23 -Release: 4.git%{shortcommit}%{?dist} +Release: 5.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -288,6 +288,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Thu Aug 03 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.23-5.git1bbd87f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Sun Jul 30 2017 Florian Weimer fweimer@redhat.com - 0.1.23-4.git1bbd87f - Rebuild with binutils fix for ppc64le (#1475636)
commit 23aabc31ace004ae4e72a18b8fc0b33a4af9722a Author: Daniel J Walsh dwalsh@redhat.com Date: Mon Jul 31 12:12:22 2017 +0000
Fix storage.conf man page to be storage.conf.5.gz so that it works.
diff --git a/skopeo.spec b/skopeo.spec index 4c0582a..1466d26 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -37,7 +37,7 @@ Name: skopeo Epoch: 1 %endif # centos Version: 0.1.23 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -211,7 +211,7 @@ make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_sysconfdir} install -m0644 %SOURCE1 %{buildroot}%{_sysconfdir}/containers/storage.conf mkdir -p %{buildroot}%{_mandir}/man5 -go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.1 +go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.5
# source codes for building projects %if 0%{?with_devel} @@ -276,7 +276,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/containers/storage.conf %dir %{_sharedstatedir}/atomic/sigstore -%{_mandir}/man5/storage* +%{_mandir}/man5/storage.conf.5*
%files %license LICENSE @@ -288,6 +288,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Tue Jul 24 2017 dwalsh dwalsh@redhat.com - 0.1.23-2.dev.git1bbd87 +- Fix storage.conf man page to be storage.conf.5.gz so that it works. + * Fri Jul 21 2017 dwalsh dwalsh@redhat.com - 0.1.23-1.dev.git1bbd87 - Support for OCI V1.0 Images - Update to image-spec v1.0.0 and revendor
commit 6ebea1b8eb8fa843e7614c24b98488eba902a2bd Author: Florian Weimer fweimer@redhat.com Date: Sun Jul 30 19:35:09 2017 +0200
Rebuild with fixed binutils for ppc64le (#1475636)
diff --git a/skopeo.spec b/skopeo.spec index cc6a73b..ee3f8e8 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -37,7 +37,7 @@ Name: skopeo Epoch: 1 %endif # centos Version: 0.1.23 -Release: 3.git%{shortcommit}%{?dist} +Release: 4.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -288,6 +288,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Sun Jul 30 2017 Florian Weimer fweimer@redhat.com - 0.1.23-4.git1bbd87f +- Rebuild with binutils fix for ppc64le (#1475636) + * Thu Jul 27 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.23-3.git1bbd87f - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit a08efd2821dfe6f0da591953597b284608868321 Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Jul 27 18:45:09 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/skopeo.spec b/skopeo.spec index 1466d26..cc6a73b 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -37,7 +37,7 @@ Name: skopeo Epoch: 1 %endif # centos Version: 0.1.23 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -288,6 +288,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Thu Jul 27 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.23-3.git1bbd87f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jul 24 2017 dwalsh dwalsh@redhat.com - 0.1.23-2.dev.git1bbd87 - Fix storage.conf man page to be storage.conf.5.gz so that it works.
commit edc236610481a06b47aa95fa5839d836e6c8e2a7 Author: Daniel J Walsh dwalsh@redhat.com Date: Tue Jul 25 14:08:54 2017 +0000
Fix storage.conf man page to be storage.conf.5.gz so that it works.
diff --git a/skopeo.spec b/skopeo.spec index 4c0582a..1466d26 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -37,7 +37,7 @@ Name: skopeo Epoch: 1 %endif # centos Version: 0.1.23 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -211,7 +211,7 @@ make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_sysconfdir} install -m0644 %SOURCE1 %{buildroot}%{_sysconfdir}/containers/storage.conf mkdir -p %{buildroot}%{_mandir}/man5 -go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.1 +go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.5
# source codes for building projects %if 0%{?with_devel} @@ -276,7 +276,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/containers/storage.conf %dir %{_sharedstatedir}/atomic/sigstore -%{_mandir}/man5/storage* +%{_mandir}/man5/storage.conf.5*
%files %license LICENSE @@ -288,6 +288,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Tue Jul 24 2017 dwalsh dwalsh@redhat.com - 0.1.23-2.dev.git1bbd87 +- Fix storage.conf man page to be storage.conf.5.gz so that it works. + * Fri Jul 21 2017 dwalsh dwalsh@redhat.com - 0.1.23-1.dev.git1bbd87 - Support for OCI V1.0 Images - Update to image-spec v1.0.0 and revendor
commit e7cf7d537d6f2bc79e1b38b5fbcdbac16f5ee4c0 Author: Daniel J Walsh dwalsh@redhat.com Date: Fri Jul 21 09:04:23 2017 +0000
Support for OCI V1.0 Images Update to image-spec v1.0.0 and revendor Fixes for authentication
diff --git a/.gitignore b/.gitignore index daf3f4a..eb938d1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /skopeo-0b73154.tar.gz /skopeo-d5e34c1.tar.gz /skopeo-5d24b67.tar.gz +/skopeo-1bbd87f.tar.gz diff --git a/skopeo.spec b/skopeo.spec index 2387426..4c0582a 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,7 +25,7 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 5d24b67f5eeeca348966adb412d8119837faa1c2 +%global commit 1bbd87f4356fed4f21b860b18c50dbe72027b1a0 %global shortcommit %(c=%{commit}; echo ${c:0:7})
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -33,7 +33,10 @@ ExcludeArch: ppc64
Name: skopeo -Version: 0.1.22 +%if 0%{?centos} +Epoch: 1 +%endif # centos +Version: 0.1.23 Release: 1.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 @@ -285,6 +288,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Fri Jul 21 2017 dwalsh dwalsh@redhat.com - 0.1.23-1.dev.git1bbd87 +- Support for OCI V1.0 Images +- Update to image-spec v1.0.0 and revendor +- Fixes for authentication + +* Sat Jul 01 2017 Lokesh Mandvekar lsm5@fedoraproject.org - 0.1.22-2.dev.git5d24b67 +- Epoch: 1 for CentOS as CentOS Extras' build already has epoch set to 1 + * Wed Jun 21 2017 dwalsh dwalsh@redhat.com - 0.1.22-1.dev.git5d24b67 - Give more useful help when explaining usage - Also specify container-storage as a valid transport diff --git a/sources b/sources index 5cfbba1..8b2ade5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-5d24b67.tar.gz) = cb3905dfde258ab07e28b39818dcb52277938a9fcfb8da2b9977fa854ae4dd78dd05aff150ff55e02d5cc0025017dddfabb48d6625a8fbbf1c2681b5019cef9e +SHA512 (skopeo-1bbd87f.tar.gz) = 46b53a488c34432e4a15827b6193c70c76a505a24e133ca378d0f77bc7612cdce25969efba42e0e9e7fdad170a05774209a303dcaa8cd6a08ba544f07daf6211
commit d0cb1ff87f4f35180a5eed4b691faf744d79c84e Author: Daniel J Walsh dwalsh@redhat.com Date: Fri Jul 21 09:02:59 2017 +0000
Support for OCI V1.0 Images Update to image-spec v1.0.0 and revendor Fixes for authentication
diff --git a/.gitignore b/.gitignore index daf3f4a..eb938d1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /skopeo-0b73154.tar.gz /skopeo-d5e34c1.tar.gz /skopeo-5d24b67.tar.gz +/skopeo-1bbd87f.tar.gz diff --git a/ostree.patch b/ostree.patch deleted file mode 100644 index c7fbc78..0000000 --- a/ostree.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go b/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go -index 7842cf9..9550f80 100644 ---- a/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go -+++ b/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go -@@ -222,7 +222,7 @@ func (repo *Repo) Commit(commitPath, branch string, opts commitOptions) (string, - filter_data.skip_list = (*C.GHashTable)(skipList.Ptr()) - C._set_owner_uid((C.guint32)(options.OwnerUID)) - C._set_owner_gid((C.guint32)(options.OwnerGID)) -- modifier = C._ostree_repo_commit_modifier_new_wrapper(flags, &filter_data, nil) -+ modifier = C._ostree_repo_commit_modifier_new_wrapper(flags, C.gpointer(&filter_data), nil) - } - - if strings.Compare(options.Parent, "") != 0 { -@@ -245,7 +245,7 @@ func (repo *Repo) Commit(commitPath, branch string, opts commitOptions) (string, - if len(commitPath) == 0 && (len(options.Tree) == 0 || len(options.Tree[0]) == 0) { - currentDir := (*C.char)(C.g_get_current_dir()) - objectToCommit = glib.ToGFile(unsafe.Pointer(C.g_file_new_for_path(currentDir))) -- C.g_free(currentDir) -+ C.g_free(C.gpointer(currentDir)) - - if !glib.GoBool(glib.GBoolean(C.ostree_repo_write_directory_to_mtree(repo.native(), (*C.GFile)(objectToCommit.Ptr()), mtree, modifier, cancellable, &cerr))) { - goto out -@@ -469,14 +469,14 @@ func handleStatOverrideLine(line string, table *glib.GHashTable) error { - } - - modeAdd = (C.guint)(C.g_ascii_strtod((*C.gchar)(C.CString(line)), nil)) -- C.g_hash_table_insert((*C.GHashTable)(table.Ptr()), C.g_strdup((*C.gchar)(C.CString(line[space+1:]))), C._guint_to_pointer(modeAdd)) -+ C.g_hash_table_insert((*C.GHashTable)(table.Ptr()), C.gpointer(C.g_strdup((*C.gchar)(C.CString(line[space+1:])))), C._guint_to_pointer(modeAdd)) - - return nil - } - - // Handle an individual line from a Skiplist file - func handleSkipListline(line string, table *glib.GHashTable) error { -- C.g_hash_table_add((*C.GHashTable)(table.Ptr()), C.g_strdup((*C.gchar)(C.CString(line)))) -+ C.g_hash_table_add((*C.GHashTable)(table.Ptr()), C.gpointer( C.g_strdup((*C.gchar)(C.CString(line))))) - - return nil - } diff --git a/skopeo.spec b/skopeo.spec index 9bea28b..4c0582a 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,7 +25,7 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 5d24b67f5eeeca348966adb412d8119837faa1c2 +%global commit 1bbd87f4356fed4f21b860b18c50dbe72027b1a0 %global shortcommit %(c=%{commit}; echo ${c:0:7})
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -36,8 +36,8 @@ Name: skopeo %if 0%{?centos} Epoch: 1 %endif # centos -Version: 0.1.22 -Release: 2.git%{shortcommit}%{?dist} +Version: 0.1.23 +Release: 1.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -288,6 +288,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Fri Jul 21 2017 dwalsh dwalsh@redhat.com - 0.1.23-1.dev.git1bbd87 +- Support for OCI V1.0 Images +- Update to image-spec v1.0.0 and revendor +- Fixes for authentication + * Sat Jul 01 2017 Lokesh Mandvekar lsm5@fedoraproject.org - 0.1.22-2.dev.git5d24b67 - Epoch: 1 for CentOS as CentOS Extras' build already has epoch set to 1
diff --git a/sources b/sources index 5cfbba1..8b2ade5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-5d24b67.tar.gz) = cb3905dfde258ab07e28b39818dcb52277938a9fcfb8da2b9977fa854ae4dd78dd05aff150ff55e02d5cc0025017dddfabb48d6625a8fbbf1c2681b5019cef9e +SHA512 (skopeo-1bbd87f.tar.gz) = 46b53a488c34432e4a15827b6193c70c76a505a24e133ca378d0f77bc7612cdce25969efba42e0e9e7fdad170a05774209a303dcaa8cd6a08ba544f07daf6211
commit 4a700a5c492acfe1d4c50d48c5aac2be42a36d7f Author: Lokesh Mandvekar lsm5@fedoraproject.org Date: Sat Jul 1 20:50:07 2017 +0000
set Epoch: 1 for CentOS
Signed-off-by: Lokesh Mandvekar lsm5@fedoraproject.org
diff --git a/skopeo.spec b/skopeo.spec index 2387426..9bea28b 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -33,8 +33,11 @@ ExcludeArch: ppc64
Name: skopeo +%if 0%{?centos} +Epoch: 1 +%endif # centos Version: 0.1.22 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -285,6 +288,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Sat Jul 01 2017 Lokesh Mandvekar lsm5@fedoraproject.org - 0.1.22-2.dev.git5d24b67 +- Epoch: 1 for CentOS as CentOS Extras' build already has epoch set to 1 + * Wed Jun 21 2017 dwalsh dwalsh@redhat.com - 0.1.22-1.dev.git5d24b67 - Give more useful help when explaining usage - Also specify container-storage as a valid transport
commit c74909b56d3798de03b69965b7cc057d38a5e0de Author: Daniel J Walsh dwalsh@redhat.com Date: Wed Jun 21 12:33:26 2017 +0000
Give more useful help when explaining usage Also specify container-storage as a valid transport Remove docker reference wherever possible vendor in ostree fixes
diff --git a/.gitignore b/.gitignore index 8473bf6..daf3f4a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /skopeo-2b3af4a.tar.gz /skopeo-0224d8c.tar.gz /skopeo-e802625.tar.gz +/skopeo-0b73154.tar.gz +/skopeo-d5e34c1.tar.gz +/skopeo-5d24b67.tar.gz diff --git a/skopeo.spec b/skopeo.spec index df12cce..2387426 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,7 +25,7 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit e802625b7cb7f4af9ab77bd2be9eb441ff2f28a2 +%global commit 5d24b67f5eeeca348966adb412d8119837faa1c2 %global shortcommit %(c=%{commit}; echo ${c:0:7})
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -33,8 +33,8 @@ ExcludeArch: ppc64
Name: skopeo -Version: 0.1.20 -Release: 2.git%{shortcommit}%{?dist} +Version: 0.1.22 +Release: 1.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -42,7 +42,6 @@ Source0: https://github.com/mtrmac/skopeo/archive/%%7Bcommit%7D/%%7Brepo%7D-%%7Bsho Source1: storage.conf Source2: storage.conf.5.md
- %if 0%{?fedora} BuildRequires: go-srpm-macros BuildRequires: compiler(go-compiler) @@ -56,6 +55,8 @@ BuildRequires: libassuan-devel # Dependencies for containers/storage BuildRequires: btrfs-progs-devel BuildRequires: pkgconfig(devmapper) +BuildRequires: ostree-devel +BuildRequires: glib2-devel
Requires: %{repo}-containers = %{version}-%{release}
@@ -284,8 +285,23 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog -* Tue May 23 2017 bbaude bbaude@redhat.com - 0.1.20-2.dev.git0224d8c +* Wed Jun 21 2017 dwalsh dwalsh@redhat.com - 0.1.22-1.dev.git5d24b67 +- Give more useful help when explaining usage +- Also specify container-storage as a valid transport +- Remove docker reference wherever possible +- vendor in ostree fixes + +* Thu Jun 15 2017 dwalsh dwalsh@redhat.com - 0.1.21-1.dev.git0b73154 - Add support for storage.conf and storage-config.5.md from github container storage package +- Bump to the latest version of skopeo +- vendor.conf: add ostree-go +- it is used by containers/image for pulling images to the OSTree storage. +- fail early when image os does not match host os +- Improve documentation on what to do with containers/image failures in test-skopeo +- We now have the docker-archive: transport +- Integration tests with built registries also exist +- Support /etc/docker/certs.d +- update image-spec to v1.0.0-rc6
* Tue May 23 2017 bbaude bbaude@redhat.com - 0.1.20-1.dev.git0224d8c - BZ #1380078 - New release diff --git a/sources b/sources index ea7ae97..5cfbba1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-e802625.tar.gz) = 05c5e3da5aa1766c84a9e1ea758559fcbdff9613200db2a09b15da7a243d70f2e13943ce74dad2945673376d2e018d51b7f5791ac979fce7d68dcad31a51d341 +SHA512 (skopeo-5d24b67.tar.gz) = cb3905dfde258ab07e28b39818dcb52277938a9fcfb8da2b9977fa854ae4dd78dd05aff150ff55e02d5cc0025017dddfabb48d6625a8fbbf1c2681b5019cef9e
commit 483c6cabef7ac36eae3f0e5780d6d259cd7ff3fc Author: Daniel J Walsh dwalsh@redhat.com Date: Wed Jun 21 12:31:01 2017 +0000
Give more useful help when explaining usage Also specify container-storage as a valid transport Remove docker reference wherever possible vendor in ostree fixes
diff --git a/.gitignore b/.gitignore index 7f25527..daf3f4a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /skopeo-e802625.tar.gz /skopeo-0b73154.tar.gz /skopeo-d5e34c1.tar.gz +/skopeo-5d24b67.tar.gz diff --git a/skopeo.spec b/skopeo.spec index ddc23bb..2387426 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,7 +25,7 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit d5e34c1b5e1635c9d4ca2c45c240c78f2b26d395 +%global commit 5d24b67f5eeeca348966adb412d8119837faa1c2 %global shortcommit %(c=%{commit}; echo ${c:0:7})
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -33,7 +33,7 @@ ExcludeArch: ppc64
Name: skopeo -Version: 0.1.21 +Version: 0.1.22 Release: 1.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 @@ -41,7 +41,6 @@ URL: https://%%7Bprovider_prefix%7D Source0: https://github.com/mtrmac/skopeo/archive/%%7Bcommit%7D/%%7Brepo%7D-%%7Bshort... Source1: storage.conf Source2: storage.conf.5.md -Patch0: ostree.patch
%if 0%{?fedora} BuildRequires: go-srpm-macros @@ -286,6 +285,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Wed Jun 21 2017 dwalsh dwalsh@redhat.com - 0.1.22-1.dev.git5d24b67 +- Give more useful help when explaining usage +- Also specify container-storage as a valid transport +- Remove docker reference wherever possible +- vendor in ostree fixes + * Thu Jun 15 2017 dwalsh dwalsh@redhat.com - 0.1.21-1.dev.git0b73154 - Add support for storage.conf and storage-config.5.md from github container storage package - Bump to the latest version of skopeo diff --git a/sources b/sources index eaf7b12..5cfbba1 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (skopeo-0b73154.tar.gz) = 6632f2b495c983a2c2ee6581ecf32fc5935e4c9b2cc4bf5789264356a7fd53e93d834c3b8debf7f6036d2ed832613fcefca34f79623842b3b61ad83bc81fe0ac -SHA512 (skopeo-d5e34c1.tar.gz) = cf8a1a0e155429c24662608ac6618bd7746aef9262c36a1b0550665fa79bca79025b45fb55defab963993bae5783f2c7d9a63d5dd4ef7e5ae75d06ea208ecd7f +SHA512 (skopeo-5d24b67.tar.gz) = cb3905dfde258ab07e28b39818dcb52277938a9fcfb8da2b9977fa854ae4dd78dd05aff150ff55e02d5cc0025017dddfabb48d6625a8fbbf1c2681b5019cef9e
commit c53b2eaec8e0342cec0e2667d05ef50220bd5915 Author: Colin Walters walters@verbum.org Date: Tue Jun 20 10:22:06 2017 -0400
Use Patch0 so rpmdistro-gitoverlay removes it
diff --git a/skopeo.spec b/skopeo.spec index 16444f6..ddc23bb 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -41,7 +41,7 @@ URL: https://%%7Bprovider_prefix%7D Source0: https://github.com/mtrmac/skopeo/archive/%%7Bcommit%7D/%%7Brepo%7D-%%7Bshort... Source1: storage.conf Source2: storage.conf.5.md -Patch: ostree.patch +Patch0: ostree.patch
%if 0%{?fedora} BuildRequires: go-srpm-macros
commit 0e479ae9a0e4bb7e7d9518a77132a710204b0488 Author: Daniel J Walsh dwalsh@redhat.com Date: Fri Jun 16 12:28:36 2017 +0000
Add support for storage.conf and storage-config.5.md from github container storage package Bump to the latest version of skopeo vendor.conf: add ostree-go it is used by containers/image for pulling images to the OSTree storage. fail early when image os does not match host os Improve documentation on what to do with containers/image failures in test-skopeo We now have the docker-archive: transport Integration tests with built registries also exist Support /etc/docker/certs.d update image-spec to v1.0.0-rc6
diff --git a/ostree.patch b/ostree.patch new file mode 100644 index 0000000..c7fbc78 --- /dev/null +++ b/ostree.patch @@ -0,0 +1,39 @@ +diff --git a/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go b/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go +index 7842cf9..9550f80 100644 +--- a/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go ++++ b/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go +@@ -222,7 +222,7 @@ func (repo *Repo) Commit(commitPath, branch string, opts commitOptions) (string, + filter_data.skip_list = (*C.GHashTable)(skipList.Ptr()) + C._set_owner_uid((C.guint32)(options.OwnerUID)) + C._set_owner_gid((C.guint32)(options.OwnerGID)) +- modifier = C._ostree_repo_commit_modifier_new_wrapper(flags, &filter_data, nil) ++ modifier = C._ostree_repo_commit_modifier_new_wrapper(flags, C.gpointer(&filter_data), nil) + } + + if strings.Compare(options.Parent, "") != 0 { +@@ -245,7 +245,7 @@ func (repo *Repo) Commit(commitPath, branch string, opts commitOptions) (string, + if len(commitPath) == 0 && (len(options.Tree) == 0 || len(options.Tree[0]) == 0) { + currentDir := (*C.char)(C.g_get_current_dir()) + objectToCommit = glib.ToGFile(unsafe.Pointer(C.g_file_new_for_path(currentDir))) +- C.g_free(currentDir) ++ C.g_free(C.gpointer(currentDir)) + + if !glib.GoBool(glib.GBoolean(C.ostree_repo_write_directory_to_mtree(repo.native(), (*C.GFile)(objectToCommit.Ptr()), mtree, modifier, cancellable, &cerr))) { + goto out +@@ -469,14 +469,14 @@ func handleStatOverrideLine(line string, table *glib.GHashTable) error { + } + + modeAdd = (C.guint)(C.g_ascii_strtod((*C.gchar)(C.CString(line)), nil)) +- C.g_hash_table_insert((*C.GHashTable)(table.Ptr()), C.g_strdup((*C.gchar)(C.CString(line[space+1:]))), C._guint_to_pointer(modeAdd)) ++ C.g_hash_table_insert((*C.GHashTable)(table.Ptr()), C.gpointer(C.g_strdup((*C.gchar)(C.CString(line[space+1:])))), C._guint_to_pointer(modeAdd)) + + return nil + } + + // Handle an individual line from a Skiplist file + func handleSkipListline(line string, table *glib.GHashTable) error { +- C.g_hash_table_add((*C.GHashTable)(table.Ptr()), C.g_strdup((*C.gchar)(C.CString(line)))) ++ C.g_hash_table_add((*C.GHashTable)(table.Ptr()), C.gpointer( C.g_strdup((*C.gchar)(C.CString(line))))) + + return nil + } diff --git a/skopeo.spec b/skopeo.spec index e183009..16444f6 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -41,7 +41,7 @@ URL: https://%%7Bprovider_prefix%7D Source0: https://github.com/mtrmac/skopeo/archive/%%7Bcommit%7D/%%7Brepo%7D-%%7Bshort... Source1: storage.conf Source2: storage.conf.5.md - +Patch: ostree.patch
%if 0%{?fedora} BuildRequires: go-srpm-macros
commit 6f31f0e7be9417f78e0b00e27ed786efe63945b7 Author: Daniel J Walsh dwalsh@redhat.com Date: Fri Jun 16 10:02:00 2017 +0000
Add support for storage.conf and storage-config.5.md from github container storage package Bump to the latest version of skopeo vendor.conf: add ostree-go it is used by containers/image for pulling images to the OSTree storage. fail early when image os does not match host os Improve documentation on what to do with containers/image failures in test-skopeo We now have the docker-archive: transport Integration tests with built registries also exist Support /etc/docker/certs.d update image-spec to v1.0.0-rc6
diff --git a/.gitignore b/.gitignore index 0a12211..7f25527 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /skopeo-0224d8c.tar.gz /skopeo-e802625.tar.gz /skopeo-0b73154.tar.gz +/skopeo-d5e34c1.tar.gz diff --git a/skopeo.spec b/skopeo.spec index ffe9682..e183009 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,7 +25,7 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 0b7315460126b8945fd53f9318a65d7cc8796af1 +%global commit d5e34c1b5e1635c9d4ca2c45c240c78f2b26d395 %global shortcommit %(c=%{commit}; echo ${c:0:7})
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required diff --git a/sources b/sources index d47378d..eaf7b12 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (skopeo-0b73154.tar.gz) = 6632f2b495c983a2c2ee6581ecf32fc5935e4c9b2cc4bf5789264356a7fd53e93d834c3b8debf7f6036d2ed832613fcefca34f79623842b3b61ad83bc81fe0ac +SHA512 (skopeo-d5e34c1.tar.gz) = cf8a1a0e155429c24662608ac6618bd7746aef9262c36a1b0550665fa79bca79025b45fb55defab963993bae5783f2c7d9a63d5dd4ef7e5ae75d06ea208ecd7f
commit db8c5487e5bd386eb78507a5213de9a325f48562 Author: Daniel J Walsh dwalsh@redhat.com Date: Thu Jun 15 17:27:55 2017 +0000
Add support for storage.conf and storage-config.5.md from github container storage package Bump to the latest version of skopeo vendor.conf: add ostree-go it is used by containers/image for pulling images to the OSTree storage. fail early when image os does not match host os Improve documentation on what to do with containers/image failures in test-skopeo We now have the docker-archive: transport Integration tests with built registries also exist Support /etc/docker/certs.d update image-spec to v1.0.0-rc6
diff --git a/skopeo.spec b/skopeo.spec index fe0d64b..ffe9682 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -57,6 +57,7 @@ BuildRequires: libassuan-devel BuildRequires: btrfs-progs-devel BuildRequires: pkgconfig(devmapper) BuildRequires: ostree-devel +BuildRequires: glib2-devel
Requires: %{repo}-containers = %{version}-%{release}
commit 1e1d05f997841daedb9a02ad59dd4acba3fac7c4 Author: Daniel J Walsh dwalsh@redhat.com Date: Thu Jun 15 16:03:29 2017 +0000
Add support for storage.conf and storage-config.5.md from github container storage package Bump to the latest version of skopeo vendor.conf: add ostree-go it is used by containers/image for pulling images to the OSTree storage. fail early when image os does not match host os Improve documentation on what to do with containers/image failures in test-skopeo We now have the docker-archive: transport Integration tests with built registries also exist Support /etc/docker/certs.d update image-spec to v1.0.0-rc6
diff --git a/skopeo.spec b/skopeo.spec index 934faac..fe0d64b 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -56,6 +56,7 @@ BuildRequires: libassuan-devel # Dependencies for containers/storage BuildRequires: btrfs-progs-devel BuildRequires: pkgconfig(devmapper) +BuildRequires: ostree-devel
Requires: %{repo}-containers = %{version}-%{release}
commit 576e1e818b0b702fbe4f7e84002b20bea8fd7fb6 Author: Daniel J Walsh dwalsh@redhat.com Date: Thu Jun 15 15:39:13 2017 +0000
Add support for storage.conf and storage-config.5.md from github container storage package Bump to the latest version of skopeo vendor.conf: add ostree-go it is used by containers/image for pulling images to the OSTree storage. fail early when image os does not match host os Improve documentation on what to do with containers/image failures in test-skopeo We now have the docker-archive: transport Integration tests with built registries also exist Support /etc/docker/certs.d update image-spec to v1.0.0-rc6
diff --git a/.gitignore b/.gitignore index 8473bf6..0a12211 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /skopeo-2b3af4a.tar.gz /skopeo-0224d8c.tar.gz /skopeo-e802625.tar.gz +/skopeo-0b73154.tar.gz diff --git a/skopeo.spec b/skopeo.spec index df12cce..934faac 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,7 +25,7 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit e802625b7cb7f4af9ab77bd2be9eb441ff2f28a2 +%global commit 0b7315460126b8945fd53f9318a65d7cc8796af1 %global shortcommit %(c=%{commit}; echo ${c:0:7})
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -33,8 +33,8 @@ ExcludeArch: ppc64
Name: skopeo -Version: 0.1.20 -Release: 2.git%{shortcommit}%{?dist} +Version: 0.1.21 +Release: 1.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -284,8 +284,17 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog -* Tue May 23 2017 bbaude bbaude@redhat.com - 0.1.20-2.dev.git0224d8c +* Thu Jun 15 2017 dwalsh dwalsh@redhat.com - 0.1.21-1.dev.git0b73154 - Add support for storage.conf and storage-config.5.md from github container storage package +- Bump to the latest version of skopeo +- vendor.conf: add ostree-go +- it is used by containers/image for pulling images to the OSTree storage. +- fail early when image os does not match host os +- Improve documentation on what to do with containers/image failures in test-skopeo +- We now have the docker-archive: transport +- Integration tests with built registries also exist +- Support /etc/docker/certs.d +- update image-spec to v1.0.0-rc6
* Tue May 23 2017 bbaude bbaude@redhat.com - 0.1.20-1.dev.git0224d8c - BZ #1380078 - New release diff --git a/sources b/sources index ea7ae97..d47378d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-e802625.tar.gz) = 05c5e3da5aa1766c84a9e1ea758559fcbdff9613200db2a09b15da7a243d70f2e13943ce74dad2945673376d2e018d51b7f5791ac979fce7d68dcad31a51d341 +SHA512 (skopeo-0b73154.tar.gz) = 6632f2b495c983a2c2ee6581ecf32fc5935e4c9b2cc4bf5789264356a7fd53e93d834c3b8debf7f6036d2ed832613fcefca34f79623842b3b61ad83bc81fe0ac
commit 38acbec53d12f258d6a3ee84eb53995c73e8a3da Author: Daniel J Walsh dwalsh@redhat.com Date: Wed Jun 14 19:05:31 2017 +0000
Add support for storage.conf and storage-config.5.md from github container storage package
diff --git a/skopeo.spec b/skopeo.spec index 3c69300..df12cce 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -34,11 +34,14 @@ ExcludeArch: ppc64
Name: skopeo Version: 0.1.20 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D Source0: https://github.com/mtrmac/skopeo/archive/%%7Bcommit%7D/%%7Brepo%7D-%%7Bshort... +Source1: storage.conf +Source2: storage.conf.5.md +
%if 0%{?fedora} BuildRequires: go-srpm-macros @@ -201,6 +204,10 @@ make binary-local docs
%install make DESTDIR=%{buildroot} install +mkdir -p %{buildroot}%{_sysconfdir} +install -m0644 %SOURCE1 %{buildroot}%{_sysconfdir}/containers/storage.conf +mkdir -p %{buildroot}%{_mandir}/man5 +go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.1
# source codes for building projects %if 0%{?with_devel} @@ -259,12 +266,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif
%files containers -%{_sysconfdir}/containers -%config(noreplace) %{_sysconfdir}/containers/policy.json -%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %dir %{_sysconfdir}/containers %dir %{_sysconfdir}/containers/registries.d +%config(noreplace) %{_sysconfdir}/containers/policy.json +%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml +%config(noreplace) %{_sysconfdir}/containers/storage.conf %dir %{_sharedstatedir}/atomic/sigstore +%{_mandir}/man5/storage*
%files %license LICENSE @@ -276,6 +284,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Tue May 23 2017 bbaude bbaude@redhat.com - 0.1.20-2.dev.git0224d8c +- Add support for storage.conf and storage-config.5.md from github container storage package + * Tue May 23 2017 bbaude bbaude@redhat.com - 0.1.20-1.dev.git0224d8c - BZ #1380078 - New release
@@ -295,10 +306,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} * Tue Dec 06 2016 Lokesh Mandvekar lsm5@fedoraproject.org - 0.1.17-1.dev.git2b3af4a - bump to 0.1.17-dev
-* Fri Nov 04 2016 Antonio Murdaca runcom@fedoraproject.org - 0.1.14-5.git550a480 +* Fri Nov 04 2016 Antonio Murdaca runcom@fedoraproject.org - 0.1.14-6.git550a480 - Fix BZ#1391932
-* Tue Oct 18 2016 Antonio Murdaca runcom@fedoraproject.org - 0.1.14-4.git550a480 +* Tue Oct 18 2016 Antonio Murdaca runcom@fedoraproject.org - 0.1.14-5.git550a480 +- Conflicts with atomic in skopeo-containers + +* Wed Oct 12 2016 Antonio Murdaca runcom@fedoraproject.org - 0.1.14-4.git550a480 - built skopeo-containers
* Wed Sep 21 2016 Lokesh Mandvekar lsm5@fedoraproject.org - 0.1.14-3.gitd830391 diff --git a/storage.conf b/storage.conf new file mode 100644 index 0000000..519a0ab --- /dev/null +++ b/storage.conf @@ -0,0 +1,17 @@ +# The "container storage" table contains all of the server options. +[storage] + +# Default Storage Driver +driver = "overlay" + +# Temporary storage location +runroot = "/var/run/containers/storage" + +# Primary Read/Write location of container storage +graphroot = "/var/lib/containers/storage" + +[storage.options] +# AdditionalImageStores is used to pass paths to additional Read/Only image stores +# Must be comma separated list. +additionalimagestores = [ +] diff --git a/storage.conf.5.md b/storage.conf.5.md new file mode 100644 index 0000000..39a8fb7 --- /dev/null +++ b/storage.conf.5.md @@ -0,0 +1,49 @@ +% storage.conf(5) Container Storage Configuration File +% Dan Walsh +% May 2017 + +# NAME +storage.conf - Syntax of Container Storage configuration file + +# DESCRIPTION +The STORAGE configuration file specifies all of the available container storage options +for tools using shared container storage, but in a TOML format that can be more easily modified +and versioned. + +# FORMAT +The [TOML format][toml] is used as the encoding of the configuration file. +Every option and subtable listed here is nested under a global "storage" table. +No bare options are used. The format of TOML can be simplified to: + + [table] + option = value + + [table.subtable1] + option = value + + [table.subtable2] + option = value + +## STORAGE TABLE + +The `storage` table supports the following options: + + +**graphroot**="" + container storage graph dir (default: "/var/lib/containers/storage") + Default directory to store all writable content created by container storage programs + +**runroot**="" + container storage run dir (default: "/var/run/containers/storage") + Default directory to store all temporary writable content created by container storage programs + +**driver**="" + container storage driver (default is "overlay") + Default Copy On Write (COW) container storage driver + +**additionalimagestores**=[] + Paths to additional congtainer image stores. Usually these are read/only and stored on remote network shares. + +# HISTORY +May 2017, Originally compiled by Dan Walsh dwalsh@redhat.com +Format copied from crio.conf man page created by Aleksa Sarai asarai@suse.de
commit c38bfdcc09111afef2cf63582a6f3f155a2aaba3 Author: Daniel J Walsh dwalsh@redhat.com Date: Wed Jun 14 19:01:59 2017 +0000
Add support for storage.conf and storage-config.5.md from github container storage package
diff --git a/storage.conf b/storage.conf new file mode 100644 index 0000000..519a0ab --- /dev/null +++ b/storage.conf @@ -0,0 +1,17 @@ +# The "container storage" table contains all of the server options. +[storage] + +# Default Storage Driver +driver = "overlay" + +# Temporary storage location +runroot = "/var/run/containers/storage" + +# Primary Read/Write location of container storage +graphroot = "/var/lib/containers/storage" + +[storage.options] +# AdditionalImageStores is used to pass paths to additional Read/Only image stores +# Must be comma separated list. +additionalimagestores = [ +] diff --git a/storage.conf.5.md b/storage.conf.5.md new file mode 100644 index 0000000..39a8fb7 --- /dev/null +++ b/storage.conf.5.md @@ -0,0 +1,49 @@ +% storage.conf(5) Container Storage Configuration File +% Dan Walsh +% May 2017 + +# NAME +storage.conf - Syntax of Container Storage configuration file + +# DESCRIPTION +The STORAGE configuration file specifies all of the available container storage options +for tools using shared container storage, but in a TOML format that can be more easily modified +and versioned. + +# FORMAT +The [TOML format][toml] is used as the encoding of the configuration file. +Every option and subtable listed here is nested under a global "storage" table. +No bare options are used. The format of TOML can be simplified to: + + [table] + option = value + + [table.subtable1] + option = value + + [table.subtable2] + option = value + +## STORAGE TABLE + +The `storage` table supports the following options: + + +**graphroot**="" + container storage graph dir (default: "/var/lib/containers/storage") + Default directory to store all writable content created by container storage programs + +**runroot**="" + container storage run dir (default: "/var/run/containers/storage") + Default directory to store all temporary writable content created by container storage programs + +**driver**="" + container storage driver (default is "overlay") + Default Copy On Write (COW) container storage driver + +**additionalimagestores**=[] + Paths to additional congtainer image stores. Usually these are read/only and stored on remote network shares. + +# HISTORY +May 2017, Originally compiled by Dan Walsh dwalsh@redhat.com +Format copied from crio.conf man page created by Aleksa Sarai asarai@suse.de
commit 6d3ff1d95d94bb03b732bb53e00e1c1bf18c7825 Author: Daniel J Walsh dwalsh@redhat.com Date: Wed Jun 14 19:00:28 2017 +0000
Add support for storage.conf and storage-config.5.md from github container storage package
diff --git a/skopeo.spec b/skopeo.spec index 373bb84..df12cce 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -34,11 +34,13 @@ ExcludeArch: ppc64
Name: skopeo Version: 0.1.20 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D Source0: https://github.com/mtrmac/skopeo/archive/%%7Bcommit%7D/%%7Brepo%7D-%%7Bshort... +Source1: storage.conf +Source2: storage.conf.5.md
%if 0%{?fedora} @@ -202,6 +204,10 @@ make binary-local docs
%install make DESTDIR=%{buildroot} install +mkdir -p %{buildroot}%{_sysconfdir} +install -m0644 %SOURCE1 %{buildroot}%{_sysconfdir}/containers/storage.conf +mkdir -p %{buildroot}%{_mandir}/man5 +go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.1
# source codes for building projects %if 0%{?with_devel} @@ -260,12 +266,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif
%files containers -%{_sysconfdir}/containers -%config(noreplace) %{_sysconfdir}/containers/policy.json -%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %dir %{_sysconfdir}/containers %dir %{_sysconfdir}/containers/registries.d +%config(noreplace) %{_sysconfdir}/containers/policy.json +%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml +%config(noreplace) %{_sysconfdir}/containers/storage.conf %dir %{_sharedstatedir}/atomic/sigstore +%{_mandir}/man5/storage*
%files %license LICENSE @@ -277,6 +284,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Tue May 23 2017 bbaude bbaude@redhat.com - 0.1.20-2.dev.git0224d8c +- Add support for storage.conf and storage-config.5.md from github container storage package + * Tue May 23 2017 bbaude bbaude@redhat.com - 0.1.20-1.dev.git0224d8c - BZ #1380078 - New release
commit 527c0586ded674954864e87d7e43f9b9d29288a7 Author: Brent Baude bbaude@redhat.com Date: Tue May 23 12:47:10 2017 -0500
New version skopeo-0.1.20
diff --git a/.gitignore b/.gitignore index c589337..8473bf6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /skopeo-550a480.tar.gz /skopeo-2b3af4a.tar.gz /skopeo-0224d8c.tar.gz +/skopeo-e802625.tar.gz diff --git a/skopeo.spec b/skopeo.spec index c261ef8..3c69300 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,7 +25,7 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 0224d8cd387b69f1d48d7727e303e4e95a02c2af +%global commit e802625b7cb7f4af9ab77bd2be9eb441ff2f28a2 %global shortcommit %(c=%{commit}; echo ${c:0:7})
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -33,8 +33,8 @@ ExcludeArch: ppc64
Name: skopeo -Version: 0.1.19 -Release: 1.dev.git%{shortcommit}%{?dist} +Version: 0.1.20 +Release: 1.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -276,6 +276,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Tue May 23 2017 bbaude bbaude@redhat.com - 0.1.20-1.dev.git0224d8c +- BZ #1380078 - New release + +* Tue Apr 25 2017 bbaude bbaude@redhat.com - 0.1.19-2.dev.git0224d8c +- No golang support for ppc64. Adding exclude arch. BZ #1445490 + * Tue Feb 28 2017 Lokesh Mandvekar lsm5@fedoraproject.org - 0.1.19-1.dev.git0224d8c - bump to v0.1.19-dev - built commit 0224d8c diff --git a/sources b/sources index afc01e6..ea7ae97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-0224d8c.tar.gz) = d63aeaf3bb2146b83f709363af7f408c853c6a305e5a7687c4c074c79fdca4c23898b0e2ec260a98a02e93dee7aa4adba8eb3bf25112f6e608e4482c26bb04f4 +SHA512 (skopeo-e802625.tar.gz) = 05c5e3da5aa1766c84a9e1ea758559fcbdff9613200db2a09b15da7a243d70f2e13943ce74dad2945673376d2e018d51b7f5791ac979fce7d68dcad31a51d341
commit 5168c6fb1f7dccedc465f116e7ae1f3697c4bd9b Author: Brent Baude bbaude@redhat.com Date: Tue May 23 12:47:10 2017 -0500
New version skopeo-0.1.20
diff --git a/.gitignore b/.gitignore index c589337..8473bf6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /skopeo-550a480.tar.gz /skopeo-2b3af4a.tar.gz /skopeo-0224d8c.tar.gz +/skopeo-e802625.tar.gz diff --git a/skopeo.spec b/skopeo.spec index da5c39d..373bb84 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,7 +25,7 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 0224d8cd387b69f1d48d7727e303e4e95a02c2af +%global commit e802625b7cb7f4af9ab77bd2be9eb441ff2f28a2 %global shortcommit %(c=%{commit}; echo ${c:0:7})
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -33,8 +33,8 @@ ExcludeArch: ppc64
Name: skopeo -Version: 0.1.19 -Release: 2.dev.git%{shortcommit}%{?dist} +Version: 0.1.20 +Release: 1.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -277,6 +277,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Tue May 23 2017 bbaude bbaude@redhat.com - 0.1.20-1.dev.git0224d8c +- BZ #1380078 - New release + * Tue Apr 25 2017 bbaude bbaude@redhat.com - 0.1.19-2.dev.git0224d8c - No golang support for ppc64. Adding exclude arch. BZ #1445490
diff --git a/sources b/sources index afc01e6..ea7ae97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-0224d8c.tar.gz) = d63aeaf3bb2146b83f709363af7f408c853c6a305e5a7687c4c074c79fdca4c23898b0e2ec260a98a02e93dee7aa4adba8eb3bf25112f6e608e4482c26bb04f4 +SHA512 (skopeo-e802625.tar.gz) = 05c5e3da5aa1766c84a9e1ea758559fcbdff9613200db2a09b15da7a243d70f2e13943ce74dad2945673376d2e018d51b7f5791ac979fce7d68dcad31a51d341
commit 2abb4e7e66259e53707d0fe55b2fcd5264834787 Author: Brent Baude bbaude@redhat.com Date: Wed Apr 26 09:29:14 2017 -0500
No docker for ppc64
diff --git a/skopeo.spec b/skopeo.spec index e0ad387..c261ef8 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -28,6 +28,10 @@ %global commit 0224d8cd387b69f1d48d7727e303e4e95a02c2af %global shortcommit %(c=%{commit}; echo ${c:0:7})
+# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required +# manually listed arches due https://bugzilla.redhat.com/show_bug.cgi?id=1391932 (removed ppc64) +ExcludeArch: ppc64 + Name: skopeo Version: 0.1.19 Release: 1.dev.git%{shortcommit}%{?dist} @@ -36,10 +40,6 @@ License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D Source0: https://github.com/mtrmac/skopeo/archive/%%7Bcommit%7D/%%7Brepo%7D-%%7Bshort...
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -#ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} -# manually listed arches due https://bugzilla.redhat.com/show_bug.cgi?id=1391932 (removed ppc64) -ExclusiveArch: %{?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}}%{!?go_arches:%{ix86} x86_64 %{arm}} %if 0%{?fedora} BuildRequires: go-srpm-macros BuildRequires: compiler(go-compiler)
commit 9d4641552fb0285a7742111aedf2551d9e76b130 Author: Lokesh Mandvekar lsm5@fedoraproject.org Date: Tue Feb 28 11:29:47 2017 -0500
skopeo-0.1.19-1.dev.git0224d8c
- bump to v0.1.19-dev - built commit 0224d8c
Signed-off-by: Lokesh Mandvekar lsm5@fedoraproject.org
diff --git a/.gitignore b/.gitignore index 10fd90b..c589337 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /skopeo-d830391.tar.gz /skopeo-550a480.tar.gz /skopeo-2b3af4a.tar.gz +/skopeo-0224d8c.tar.gz diff --git a/skopeo.spec b/skopeo.spec index 9cc1556..e0ad387 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,12 +25,12 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 2b3af4ad51520b35590f285024506393663ff8f4 +%global commit 0224d8cd387b69f1d48d7727e303e4e95a02c2af %global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: skopeo -Version: 0.1.17 -Release: 3.dev.git%{shortcommit}%{?dist} +Version: 0.1.19 +Release: 1.dev.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -276,6 +276,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Tue Feb 28 2017 Lokesh Mandvekar lsm5@fedoraproject.org - 0.1.19-1.dev.git0224d8c +- bump to v0.1.19-dev +- built commit 0224d8c + * Sat Feb 11 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.17-3.dev.git2b3af4a - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/sources b/sources index 94e616c..afc01e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e2f51644189780e3bb9299f8fd596df skopeo-2b3af4a.tar.gz +SHA512 (skopeo-0224d8c.tar.gz) = d63aeaf3bb2146b83f709363af7f408c853c6a305e5a7687c4c074c79fdca4c23898b0e2ec260a98a02e93dee7aa4adba8eb3bf25112f6e608e4482c26bb04f4
commit d2d28e36e7a26a3f29fa34acedfb610c827fa1a9 Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Feb 11 13:33:53 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/skopeo.spec b/skopeo.spec index 58ad807..9cc1556 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -30,7 +30,7 @@
Name: skopeo Version: 0.1.17 -Release: 2.dev.git%{shortcommit}%{?dist} +Release: 3.dev.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -276,6 +276,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Sat Feb 11 2017 Fedora Release Engineering releng@fedoraproject.org - 0.1.17-3.dev.git2b3af4a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Dec 10 2016 Igor Gnatenko i.gnatenko.brain@gmail.com - 0.1.17-2.dev.git2b3af4a - Rebuild for gpgme 1.18
commit 7087bb2342814e95fcc1cb4902127c2dffd301f9 Author: Colin Walters walters@verbum.org Date: Fri Dec 16 08:30:23 2016 -0500
Add another containers/storage dep
diff --git a/skopeo.spec b/skopeo.spec index fd9a2a0..58ad807 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -50,7 +50,9 @@ BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: golang-github-cpuguy83-go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel +# Dependencies for containers/storage BuildRequires: btrfs-progs-devel +BuildRequires: pkgconfig(devmapper)
Requires: %{repo}-containers = %{version}-%{release}
commit d02239395a23d9bf66ac3d4a24fc27b975addbb5 Author: Colin Walters walters@verbum.org Date: Thu Dec 15 17:11:07 2016 -0500
build: Require btrfs-progs-devel
Due to containers/storage being merged into skopeo apparently.
diff --git a/skopeo.spec b/skopeo.spec index 28214d4..fd9a2a0 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -50,6 +50,7 @@ BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: golang-github-cpuguy83-go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel +BuildRequires: btrfs-progs-devel
Requires: %{repo}-containers = %{version}-%{release}
commit f3ecd01701108e0f3c15f9bc4edb56e8ce1f2eef Author: Igor Gnatenko i.gnatenko.brain@gmail.com Date: Sat Dec 10 20:07:55 2016 +0100
Rebuild for gpgme 1.18
Signed-off-by: Igor Gnatenko i.gnatenko.brain@gmail.com
diff --git a/skopeo.spec b/skopeo.spec index 568153f..28214d4 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -30,7 +30,7 @@
Name: skopeo Version: 0.1.17 -Release: 1.dev.git%{shortcommit}%{?dist} +Release: 2.dev.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -273,6 +273,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Sat Dec 10 2016 Igor Gnatenko i.gnatenko.brain@gmail.com - 0.1.17-2.dev.git2b3af4a +- Rebuild for gpgme 1.18 + * Tue Dec 06 2016 Lokesh Mandvekar lsm5@fedoraproject.org - 0.1.17-1.dev.git2b3af4a - bump to 0.1.17-dev
commit 939b667a44624ad1b6b746902eb0adb25c0b8725 Author: Lokesh Mandvekar lsm5@fedoraproject.org Date: Tue Dec 6 18:18:31 2016 +0530
NVR: skopeo-0.1.17-1.dev.git2b3af4a
- bump to 0.1.17-dev
Signed-off-by: Lokesh Mandvekar lsm5@fedoraproject.org
diff --git a/.gitignore b/.gitignore index 82289ad..10fd90b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /skopeo-362bfc5.tar.gz /skopeo-d830391.tar.gz /skopeo-550a480.tar.gz +/skopeo-2b3af4a.tar.gz diff --git a/skopeo.spec b/skopeo.spec index a4cd331..568153f 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,19 +25,16 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 550a480173090c9b94ac3bce48953b338fa92e94 +%global commit 2b3af4ad51520b35590f285024506393663ff8f4 %global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: skopeo -Version: 0.1.14 -Release: 5.git%{shortcommit}%{?dist} +Version: 0.1.17 +Release: 1.dev.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D Source0: https://github.com/mtrmac/skopeo/archive/%%7Bcommit%7D/%%7Brepo%7D-%%7Bshort... -%if 0%{?rhel} -Patch0: skopeo-go142.patch -%endif
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} @@ -276,6 +273,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Tue Dec 06 2016 Lokesh Mandvekar lsm5@fedoraproject.org - 0.1.17-1.dev.git2b3af4a +- bump to 0.1.17-dev + * Fri Nov 04 2016 Antonio Murdaca runcom@fedoraproject.org - 0.1.14-5.git550a480 - Fix BZ#1391932
diff --git a/sources b/sources index 6a15614..94e616c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7483e9d1263f0e85f1b5e60218a0c963 skopeo-550a480.tar.gz +4e2f51644189780e3bb9299f8fd596df skopeo-2b3af4a.tar.gz
commit 91ba3c41657b2bf9e5661eecdb0af0bf5feb77fa Author: Antonio Murdaca runcom@redhat.com Date: Fri Nov 4 15:01:37 2016 +0100
NVR-skopeo-0.1.14-5.git550a480
- Fix BZ#1391932
Signed-off-by: Antonio Murdaca runcom@redhat.com
diff --git a/skopeo.spec b/skopeo.spec index a0240e9..a4cd331 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -30,7 +30,7 @@
Name: skopeo Version: 0.1.14 -Release: 4.git%{shortcommit}%{?dist} +Release: 5.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -40,7 +40,9 @@ Patch0: skopeo-go142.patch %endif
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} +#ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} +# manually listed arches due https://bugzilla.redhat.com/show_bug.cgi?id=1391932 (removed ppc64) +ExclusiveArch: %{?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}}%{!?go_arches:%{ix86} x86_64 %{arm}} %if 0%{?fedora} BuildRequires: go-srpm-macros BuildRequires: compiler(go-compiler) @@ -274,6 +276,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name}
%changelog +* Fri Nov 04 2016 Antonio Murdaca runcom@fedoraproject.org - 0.1.14-5.git550a480 +- Fix BZ#1391932 + * Tue Oct 18 2016 Antonio Murdaca runcom@fedoraproject.org - 0.1.14-4.git550a480 - built skopeo-containers
commit 1e05f59a0ae95091c65bb32579a897d8c5bb48af Author: Antonio Murdaca runcom@redhat.com Date: Tue Oct 18 18:53:52 2016 +0200
NVR: skopeo-0.1.14-4.git550a480
- built skopeo-containers
Signed-off-by: Antonio Murdaca runcom@redhat.com
diff --git a/.gitignore b/.gitignore index 20580cf..82289ad 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /skopeo-ffe92ed.tar.gz /skopeo-362bfc5.tar.gz /skopeo-d830391.tar.gz +/skopeo-550a480.tar.gz diff --git a/skopeo.spec b/skopeo.spec index aebbad4..a0240e9 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -25,12 +25,12 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit d8303916d52272e08d92163bba18e30c50ee24d7 +%global commit 550a480173090c9b94ac3bce48953b338fa92e94 %global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: skopeo Version: 0.1.14 -Release: 3.git%{shortcommit}%{?dist} +Release: 4.git%{shortcommit}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: https://%%7Bprovider_prefix%7D @@ -52,6 +52,8 @@ BuildRequires: golang-github-cpuguy83-go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel
+Requires: %{repo}-containers = %{version}-%{release} + %description Command line utility to inspect images and repositories directly on Docker registries without the need to pull them @@ -163,6 +165,14 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif
+%package containers +Summary: Configuration files for working with image signatures +Conflicts: atomic <= 1.13.1-2 + +%description containers +This package installs a default signature store configuration and a default +policy under `/etc/containers/`. + %prep %autosetup -Sgit -n %{name}-%{commit}
@@ -246,20 +256,27 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %doc README.md %endif
+%files containers +%{_sysconfdir}/containers +%config(noreplace) %{_sysconfdir}/containers/policy.json +%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml +%dir %{_sysconfdir}/containers +%dir %{_sysconfdir}/containers/registries.d +%dir %{_sharedstatedir}/atomic/sigstore + %files %license LICENSE %doc README.md %{_bindir}/%{name} -%{_sysconfdir}/containers %{_mandir}/man1/%{name}.1* %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/%{name} -%config(noreplace)%{_sysconfdir}/containers/policy.json -%dir %{_sysconfdir}/containers -%{_sysconfdir}/containers/registries.d
%changelog +* Tue Oct 18 2016 Antonio Murdaca runcom@fedoraproject.org - 0.1.14-4.git550a480 +- built skopeo-containers + * Wed Sep 21 2016 Lokesh Mandvekar lsm5@fedoraproject.org - 0.1.14-3.gitd830391 - built mtrmac/integrate-all-the-things commit d830391
diff --git a/sources b/sources index d83de2a..6a15614 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7b4517d6708b38a44f7b3efd9f5ae67 skopeo-d830391.tar.gz +7483e9d1263f0e85f1b5e60218a0c963 skopeo-550a480.tar.gz
arch-excludes@lists.fedoraproject.org