From c71080dc71965ab1e7a2d7b1d0138e53cd1538f7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 28 Jan 2022 14:22:56 -0500 Subject: [PATCH] fix deps and golang provides Signed-off-by: Lokesh Mandvekar --- buildah.spec | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/buildah.spec b/buildah.spec index 7441b2f..34523c3 100644 --- a/buildah.spec +++ b/buildah.spec @@ -36,52 +36,45 @@ BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: make BuildRequires: ostree-devel -# No btrfs for centos 8 -%if 0%{?fedora} && ! 0%{?eln} BuildRequires: btrfs-progs-devel -%endif Requires: containers-common >= 4:1-46 BuildRequires: libseccomp-static Requires: libseccomp >= 2.4.1-0 Suggests: cpp Suggests: qemu-user-static - -Provides: bundled(golang(github.com/containerd/containerd)) = v1.5.7 -Provides: bundled(golang(github.com/containernetworking/cni)) = v0.8.1 -Provides: bundled(golang(github.com/containers/common)) = v0.44.2 -Provides: bundled(golang(github.com/containers/image/v5)) = v5.16.0 +# awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d' +Provides: bundled(golang(github.com/containerd/containerd)) = v1.5.9 +Provides: bundled(golang(github.com/containernetworking/cni)) = v1.0.1 +Provides: bundled(golang(github.com/containers/common)) = v0.47.1 +Provides: bundled(golang(github.com/containers/image/v5)) = v5.19.0 Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.2 -Provides: bundled(golang(github.com/containers/storage)) = v1.36.0 +Provides: bundled(golang(github.com/containers/storage)) = v1.38.1 Provides: bundled(golang(github.com/docker/distribution)) = v2.7.1+incompatible +Provides: bundled(golang(github.com/docker/docker)) = v20.10.12+incompatible Provides: bundled(golang(github.com/docker/go_units)) = v0.4.0 Provides: bundled(golang(github.com/docker/libnetwork)) = v0.8.0_dev.2.0.20190625141545_5a177b73e316 -Provides: bundled(golang(github.com/fsouza/go_dockerclient)) = v1.7.4 +Provides: bundled(golang(github.com/fsouza/go_dockerclient)) = v1.7.7 Provides: bundled(golang(github.com/ghodss/yaml)) = v1.0.0 Provides: bundled(golang(github.com/hashicorp/go_multierror)) = v1.1.1 Provides: bundled(golang(github.com/ishidawataru/sctp)) = v0.0.0_20210226210310_f2269e66cdee Provides: bundled(golang(github.com/konsorten/go_windows_terminal_sequences)) = v1.0.3 Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12 -Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.4 -Provides: bundled(golang(github.com/onsi/gomega)) = v1.16.0 +Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.5 +Provides: bundled(golang(github.com/onsi/gomega)) = v1.18.0 Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0 -Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.0.2_0.20210819154149_5ad6f50d6283 -Provides: bundled(golang(github.com/opencontainers/runc)) = v1.0.2 +Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.0.3_0.20211202193544_a5463b7f9c84 +Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.0 Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.0.3_0.20210326190908_1c3f411f0417 Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.0 -Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.8.5 +Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.10.0 Provides: bundled(golang(github.com/openshift/imagebuilder)) = v1.2.2_0.20210415181909_87f3e48c2656 Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1 -Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.9.2_0.20200616122406_847368b35ebf +Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.9.2_0.20210429002308_3879420cc921 Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1 -Provides: bundled(golang(github.com/spf13/cobra)) = v1.2.1 +Provides: bundled(golang(github.com/spf13/cobra)) = v1.3.0 Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5 Provides: bundled(golang(github.com/stretchr/testify)) = v1.7.0 Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635 -Provides: bundled(golang(go.etcd.io/bbolt)) = v1.3.6 -Provides: bundled(golang(golang.org/x/crypto)) = v0.0.0_20210711020723_a769d52b0f97 -Provides: bundled(golang(golang.org/x/sync)) = v0.0.0_20210220032951_036812b2e83c -Provides: bundled(golang(golang.org/x/sys)) = v0.0.0_20210820121016_41cdb8703e55 -Provides: bundled(golang(golang.org/x/term)) = v0.0.0_20210615171337_6886f2dfbf5b Provides: bundled(golang(k8s.io/klog)) = v1.0.0 %description