From 06ee436993f90f36a7d995a56f82e5783d604905 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 06 2016 17:24:16 +0000
Subject: import skopeo-0.1.17-0.7.git1f655f3.el7


---

diff --git a/.gitignore b/.gitignore
index 8458167..2b1448a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/skopeo-d830391.tar.gz
+SOURCES/skopeo-1f655f3.tar.gz
diff --git a/.skopeo.metadata b/.skopeo.metadata
index 4057b9b..5643ff3 100644
--- a/.skopeo.metadata
+++ b/.skopeo.metadata
@@ -1 +1 @@
-a32833556ac4db56448de27ccdf5e524f78353b4 SOURCES/skopeo-d830391.tar.gz
+f124130f027fdbcf904632d5b487b6ce200bdf69 SOURCES/skopeo-1f655f3.tar.gz
diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec
index 7f1c9ea..0cdd01c 100644
--- a/SPECS/skopeo.spec
+++ b/SPECS/skopeo.spec
@@ -25,17 +25,17 @@
 # https://github.com/projectatomic/skopeo
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          d8303916d52272e08d92163bba18e30c50ee24d7
+%global commit          1f655f3f0910a87f844a0ada49eada23ad9fca03
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           skopeo
 Epoch:          1
-Version:        0.1.14
-Release:        0.6%{?dist}
+Version:        0.1.17
+Release:        0.7.git%{shortcommit}%{?dist}
 Summary:        Inspect Docker images and repositories on registries
 License:        ASL 2.0
 URL:            https://%{provider_prefix}
-Source0:        https://github.com/mtrmac/skopeo/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+Source0:        https://github.com/projectatomic/skopeo/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
 
 # 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}}
@@ -45,6 +45,7 @@ BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 
 BuildRequires:  go-md2man
 BuildRequires:  gpgme-devel
 BuildRequires:  libassuan-devel
+Requires: %{repo}-containers = %{epoch}:%{version}-%{release}
 
 %description
 Command line utility to inspect images and repositories directly on Docker
@@ -148,7 +149,7 @@ Summary:         Unit tests for %{name} package
 %endif
 
 # test subpackage tests code from devel subpackage
-Requires:        %{name}-devel = %{version}-%{release}
+Requires:        %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description unit-test-devel
 %{summary}
@@ -157,6 +158,16 @@ This package contains unit tests for project
 providing packages with %{import_path} prefix.
 %endif
 
+%package containers
+Summary: Configuration files for working with image signature
+# /etc/containers/registries.d/default.yaml has been moved from atomic to
+# skopeo-containers
+Conflicts: atomic <= 1.13.1-1
+
+%description containers
+This package installs a default signature store configuration
+policy under `/etc/containers/`.
+
 %prep
 %autosetup -Sgit -n %{repo}-%{commit}
 
@@ -251,17 +262,45 @@ 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
 %{_bindir}/skopeo
 %{_mandir}/man1/skopeo.1*
 %license LICENSE
 %doc README.md
-%config(noreplace)%{_sysconfdir}/containers/policy.json
 %{_datadir}/bash-completion/
-%{_sysconfdir}/containers/
-%{_sysconfdir}/containers/registries.d
 
 %changelog
+* Tue Nov 22 2016 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.17-0.7.git1f655f3
+- runtime dep was missing epoch value, added now
+
+* Fri Nov 18 2016 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.17-0.6.git1f655f3
+- Resolves: #1396531 - list skopeo runtime requirements correctly
+
+* Mon Oct 31 2016 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.17-0.5
+- built commit 1f655f3
+
+* Tue Oct 18 2016 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.17-0.4
+- Resolves: #1386386 - skopeo-containers conflicts with atomic <= 1.13.1-1
+- use correct bug number, #1385584 was for atomic
+
+* Tue Oct 18 2016 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.17-0.3
+- Resolves: #1385584 - skopeo-containers conflicts with atomic <= 1.13.1-1
+
+* Mon Oct 17 2016 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:0.1.17-0.2
+- obsoletes atomic, fixed dependencies
+- %{_sysconfdir}/containers/ owned only by skopeo-containers
+
+* Fri Oct 14 2016 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:0.1.17-0.1
+- rebase, skopeo-containers subpackage added
+
 * Tue Sep 20 2016 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.14-0.6
 - built mtrmac/integrate-all-the-things commit d830391