From 2587004e313e78db6f5b6ce59d7400975d3ae30c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 16 2018 15:15:43 +0000
Subject: import skopeo-0.1.31-1.dev.gitae64ff7.el7


---

diff --git a/.gitignore b/.gitignore
index 8e4ab66..aaa9d46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/skopeo-ca3bff6.tar.gz
+SOURCES/skopeo-ae64ff7.tar.gz
diff --git a/.skopeo.metadata b/.skopeo.metadata
index d53866d..77f4555 100644
--- a/.skopeo.metadata
+++ b/.skopeo.metadata
@@ -1 +1 @@
-55f4c45bd9da15a539a0ac5fb1fe2a13677bd374 SOURCES/skopeo-ca3bff6.tar.gz
+043c6bc8437e45cdb13881b9b90fef5c89738bcd SOURCES/skopeo-ae64ff7.tar.gz
diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec
index 3c9a6ad..1af61ce 100644
--- a/SPECS/skopeo.spec
+++ b/SPECS/skopeo.spec
@@ -1,15 +1,13 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
 %global with_devel 0
 %global with_bundled 1
 %global with_debug 1
 %global with_check 0
-%global with_unit_test 0
+
+%if 0%{?with_debug}
+%global _find_debuginfo_dwz_opts %{nil}
+%global _dwz_low_mem_die_limit 0
 %else
-%global with_devel 0
-%global with_bundled 1
-%global with_debug 1
-%global with_check 0
-%global with_unit_test 0
+%global debug_package   %{nil}
 %endif
 
 %global provider        github
@@ -19,13 +17,13 @@
 # https://github.com/projectatomic/skopeo
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit0         ca3bff6a7c64694416a316dec1d0c258ad7ca50e
+%global commit0         ae64ff7084c8ba60275232740b79c1876f8a5256
 %global shortcommit0    %(c=%{commit0}; echo ${c:0:7})
 %global git0            https://%{import_path}
 
 Name:           %{repo}
 Epoch:          1
-Version:        0.1.30
+Version:        0.1.31
 Release:        1.dev.git%{shortcommit0}%{?dist}
 Summary:        Inspect Docker images and repositories on registries
 License:        ASL 2.0
@@ -39,6 +37,10 @@ Source5:        registries.conf.5.md
 BuildRequires:  git
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.6.2
+%if 0%{?rhel} > 7
+BuildRequires: go-toolset-7-golang-bin
+BuildRequires: go-toolset-7-runtime
+%endif
 BuildRequires:  go-md2man
 BuildRequires:  gpgme-devel
 BuildRequires:  libassuan-devel
@@ -53,113 +55,6 @@ Requires: %{name}-containers = %{epoch}:%{version}-%{release}
 Command line utility to inspect images and repositories directly on Docker
 registries without the need to pull them
 
-%if 0%{?with_devel}
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/Azure/go-ansiterm/winterm)
-BuildRequires: golang(github.com/Sirupsen/logrus)
-BuildRequires: golang(github.com/docker/distribution)
-BuildRequires: golang(github.com/docker/distribution/context)
-BuildRequires: golang(github.com/docker/distribution/digest)
-BuildRequires: golang(github.com/docker/distribution/manifest)
-BuildRequires: golang(github.com/docker/distribution/manifest/manifestlist)
-BuildRequires: golang(github.com/docker/distribution/manifest/schema1)
-BuildRequires: golang(github.com/docker/distribution/manifest/schema2)
-BuildRequires: golang(github.com/docker/distribution/reference)
-BuildRequires: golang(github.com/docker/distribution/registry/api/errcode)
-BuildRequires: golang(github.com/docker/distribution/registry/api/v2)
-BuildRequires: golang(github.com/docker/distribution/registry/client)
-BuildRequires: golang(github.com/docker/distribution/registry/client/auth)
-BuildRequires: golang(github.com/docker/distribution/registry/client/transport)
-BuildRequires: golang(github.com/docker/distribution/registry/storage/cache)
-BuildRequires: golang(github.com/docker/distribution/registry/storage/cache/memory)
-BuildRequires: golang(github.com/docker/distribution/uuid)
-BuildRequires: golang(github.com/docker/docker/api)
-BuildRequires: golang(github.com/docker/docker/daemon/graphdriver)
-BuildRequires: golang(github.com/docker/docker/distribution/metadata)
-BuildRequires: golang(github.com/docker/docker/distribution/xfer)
-BuildRequires: golang(github.com/docker/docker/dockerversion)
-BuildRequires: golang(github.com/docker/docker/image)
-BuildRequires: golang(github.com/docker/docker/image/v1)
-BuildRequires: golang(github.com/docker/docker/layer)
-BuildRequires: golang(github.com/docker/docker/opts)
-BuildRequires: golang(github.com/docker/docker/pkg/archive)
-BuildRequires: golang(github.com/docker/docker/pkg/chrootarchive)
-BuildRequires: golang(github.com/docker/docker/pkg/fileutils)
-BuildRequires: golang(github.com/docker/docker/pkg/homedir)
-BuildRequires: golang(github.com/docker/docker/pkg/httputils)
-BuildRequires: golang(github.com/docker/docker/pkg/idtools)
-BuildRequires: golang(github.com/docker/docker/pkg/ioutils)
-BuildRequires: golang(github.com/docker/docker/pkg/jsonlog)
-BuildRequires: golang(github.com/docker/docker/pkg/jsonmessage)
-BuildRequires: golang(github.com/docker/docker/pkg/longpath)
-BuildRequires: golang(github.com/docker/docker/pkg/mflag)
-BuildRequires: golang(github.com/docker/docker/pkg/parsers/kernel)
-BuildRequires: golang(github.com/docker/docker/pkg/plugins)
-BuildRequires: golang(github.com/docker/docker/pkg/pools)
-BuildRequires: golang(github.com/docker/docker/pkg/progress)
-BuildRequires: golang(github.com/docker/docker/pkg/promise)
-BuildRequires: golang(github.com/docker/docker/pkg/random)
-BuildRequires: golang(github.com/docker/docker/pkg/reexec)
-BuildRequires: golang(github.com/docker/docker/pkg/stringid)
-BuildRequires: golang(github.com/docker/docker/pkg/system)
-BuildRequires: golang(github.com/docker/docker/pkg/tarsum)
-BuildRequires: golang(github.com/docker/docker/pkg/term)
-BuildRequires: golang(github.com/docker/docker/pkg/term/windows)
-BuildRequires: golang(github.com/docker/docker/pkg/useragent)
-BuildRequires: golang(github.com/docker/docker/pkg/version)
-BuildRequires: golang(github.com/docker/docker/reference)
-BuildRequires: golang(github.com/docker/docker/registry)
-BuildRequires: golang(github.com/docker/engine-api/types)
-BuildRequires: golang(github.com/docker/engine-api/types/blkiodev)
-BuildRequires: golang(github.com/docker/engine-api/types/container)
-BuildRequires: golang(github.com/docker/engine-api/types/filters)
-BuildRequires: golang(github.com/docker/engine-api/types/image)
-BuildRequires: golang(github.com/docker/engine-api/types/network)
-BuildRequires: golang(github.com/docker/engine-api/types/registry)
-BuildRequires: golang(github.com/docker/engine-api/types/strslice)
-BuildRequires: golang(github.com/docker/go-connections/nat)
-BuildRequires: golang(github.com/docker/go-connections/tlsconfig)
-BuildRequires: golang(github.com/docker/go-units)
-BuildRequires: golang(github.com/docker/libtrust)
-BuildRequires: golang(github.com/gorilla/context)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/opencontainers/runc/libcontainer/user)
-BuildRequires: golang(github.com/vbatts/tar-split/archive/tar)
-BuildRequires: golang(github.com/vbatts/tar-split/tar/asm)
-BuildRequires: golang(github.com/vbatts/tar-split/tar/storage)
-BuildRequires: golang(golang.org/x/net/context)
-%endif
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary:         Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires:        %{name}-devel = %{epoch}:%{version}-%{release}
-
-%description unit-test-devel
-%{summary}
-
-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
@@ -171,6 +66,10 @@ Conflicts: atomic-registries <= 1:1.22.1-2
 This package installs a default signature store configuration
 policy under `/etc/containers/`.
 
+%if 0%{?rhel} > 7
+%{enable_gotoolset7}
+%endif
+
 %prep
 %autosetup -Sgit -n %{name}-%{commit0}
 
@@ -186,12 +85,7 @@ for v in vendor/*; do
     fi
 done
 
-%if ! 0%{?with_bundled}
-rm -rf vendor/
-export GOPATH=$(pwd):%{gopath}
-%else
 export GOPATH=$(pwd):$(pwd)/vendor:%{gopath}
-%endif
 
 %if ! 0%{?gobuild:1}
 %define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**};
@@ -223,62 +117,15 @@ ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pk
 ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
 ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo
 
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go" | grep -v "./vendor") ; do
-    echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
-    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
-    echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go" | grep -v "./vendor"); do
-    echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
-    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
-    echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
-
 %check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
+%if 0%{?with_check}
 export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
-%endif
-
 %gotest %{import_path}/integration
 %endif
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
-
 %files containers
 %dir %{_sysconfdir}/containers
 %dir %{_sysconfdir}/containers/registries.d
@@ -305,6 +152,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/bash-completion/completions/%{name}
 
 %changelog
+* Wed Jul 11 2018 Lokesh Mandvekar <lsm5@redhat.com> - 0.1.31-1.dev.gitae64ff7
+- Resolves: #1599980, #1599224
+- bump to v0.1.31-dev
+- built commit ae64ff7
+
 * Sun May 20 2018 dwalsh <dwalsh@redhat.com> - 0.1.30-14.gitca3bff6
 - Add devicemapper support