diff --git a/.gitignore b/.gitignore index a1317a4..261a243 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,6 @@ moby-v20.10.10.tar.gz /moby-20.10.22.tar.gz /moby-20.10.23.tar.gz /cli-20.10.23.tar.gz +/moby-23.0.4.tar.gz +/cli-23.0.4.tar.gz +/tini-0b44d36.tar.gz diff --git a/generate-docs.sh b/generate-docs.sh new file mode 100644 index 0000000..09fb5cb --- /dev/null +++ b/generate-docs.sh @@ -0,0 +1,12 @@ +cd man +for FILE in *.md; do + base="$(basename "$FILE")" + name="${base%.md}" + num="${name##*.}" + if [ -z "$num" ] || [ "$name" = "$num" ]; then + # skip files that aren't of the format xxxx.N.md (like README.md) + continue + fi + mkdir -p "./man${num}" + (set -x ;go-md2man -in "$FILE" -out "./man${num}/${name}") +done diff --git a/moby-engine.spec b/moby-engine.spec index 6ae89ba..bb4c15b 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -18,11 +18,11 @@ # tini %global git_tini https://github.com/krallin/tini -%global commit_tini de40ad007797e0dcd8b7126f27bb87401d224240 +%global commit_tini 0b44d3665869e46ccbac7414241b8256d6234dc4 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: moby-engine -Version: 20.10.23 +Version: 23.0.4 Release: 1%{?dist} Summary: The open-source application container engine License: Apache-2.0 @@ -32,6 +32,7 @@ Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar. Source3: docker.service Source4: docker.sysconfig Source5: moby-engine-systemd-sysusers.conf +Source6: generate-docs.sh # Seperate file containing virtual provides for bundled deps that's %%include'd in the specfile. Source100: provides.spec.inc @@ -132,8 +133,7 @@ This package installs %{summary}. # correct rpmlint errors for bash completion sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker - - +cp %{SOURCE6} cli-%{version}/scripts/docs/generate-man.sh %build mkdir -p _build/bin @@ -195,7 +195,8 @@ mkdir -p _build/bin export GOBUILDTAGS="${BUILDTAGS}" %gobuild -o ../_build/bin/docker %{goipath_cli}/cmd/docker # make VERSION=%%{version} GITCOMMIT=%%{shortcommit_cli} dynbinary - man/md2man-all.sh + + scripts/docs/generate-man.sh ) %install @@ -252,7 +253,7 @@ done %files %license LICENSE cli-LICENSE -%doc AUTHORS CHANGELOG.md CONTRIBUTING.md MAINTAINERS NOTICE README.md +%doc AUTHORS CONTRIBUTING.md MAINTAINERS NOTICE README.md %doc cli-MAINTAINERS cli-NOTICE cli-README.md %config(noreplace) %{_sysconfdir}/sysconfig/docker %{_bindir}/docker @@ -280,6 +281,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Jan 29 2023 John Ghatas +- Update moby-engine to 23.0.4 + * Sun Jan 29 2023 Sérgio Basto - Update moby-engine to 20.10.23 diff --git a/provides.spec.inc b/provides.spec.inc index 4ee5cbb..87f2416 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,230 +2,107 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-20.10.23/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' -Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 -Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 -Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 -Provides: bundled(golang(github.com/cespare/xxhash/v2)) = d7df74196a9e781ede915320c11c378c1b2f3a1f -Provides: bundled(golang(github.com/containerd/cgroups)) = 0b889c03f102012f1d93a97ddd3ef71cd6f4f510 -Provides: bundled(golang(github.com/containerd/console)) = 5d7e1412f07b502a01029ea20e20e0d2be31fa7c -Provides: bundled(golang(github.com/containerd/containerd)) = 0edc412565dcc6e3d6125ff9e4b009ad4b89c638 -Provides: bundled(golang(github.com/containerd/continuity)) = 5ad51c7aca47b8e742f5e6e7dc841d50f5f6affd -Provides: bundled(golang(github.com/containerd/typeurl)) = cd3ce7159eae562a4f60ceff37dada11a939d247 -Provides: bundled(golang(github.com/coreos/etcd)) = d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9 -Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = b1ec32e02fe539480dc03e3bf381c20066e7c6cc -Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc -Provides: bundled(golang(github.com/davecgh/go-spew)) = 8991bc29aa16c548c550c7ff78260e27b9ab7c73 -Provides: bundled(golang(github.com/docker/compose-on-kubernetes)) = 1f9b5b8cb6aca13deee947511801cf89447c1bfe -Provides: bundled(golang(github.com/docker/distribution)) = b5ca020cfbe998e5af3457fda087444cf5116496 -Provides: bundled(golang(github.com/docker/docker)) = 42c8b314993e5eb3cc2776da0bbe41d5eb4b707b -Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee -Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 -Provides: bundled(golang(github.com/docker/go)) = d30aec9fd63c35133f8f79c3412ad91a3b08be06 -Provides: bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa76fe4ac244571fab96ae47f -Provides: bundled(golang(github.com/docker/go-metrics)) = b619b3592b65de4f087d9f16863a7e6ff905973c -Provides: bundled(golang(github.com/docker/go-units)) = 519db1ee28dcc9fd2474ae59fca29a810482bfb1 -Provides: bundled(golang(github.com/docker/swarmkit)) = 17d8d4e4d8bdec33d386e6362d3537fa9493ba00 -Provides: bundled(golang(github.com/evanphx/json-patch)) = 72bf35d0ff611848c1dc9df0f976c81192392fa5 -Provides: bundled(golang(github.com/fvbommel/sortorder)) = 26fad50c6b32a3064c09ed089865c16f2f3615f6 -Provides: bundled(golang(github.com/gofrs/flock)) = 6caa7350c26b838538005fae7dbee4e69d9398db -Provides: bundled(golang(github.com/gogo/googleapis)) = 01e0f9cca9b92166042241267ee2a5cdf5cff46c -Provides: bundled(golang(github.com/gogo/protobuf)) = 5628607bb4c51c3157aacc3a50f0ab707582b805 -Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6baa9cfbc11732cdf6546b17c1298 -Provides: bundled(golang(github.com/golang/protobuf)) = 84668698ea25b64748563aa20726db66a6b8d299 -Provides: bundled(golang(github.com/googleapis/gnostic)) = 7c663266750e7d82587642f65e60bc4083f1f84e -Provides: bundled(golang(github.com/google/go-cmp)) = 3af367b6b30c263d47e8895973edcca9a49cf029 -Provides: bundled(golang(github.com/google/gofuzz)) = f140a6486e521aad38f5917de355cbf147cc0496 -Provides: bundled(golang(github.com/google/shlex)) = e7afc7fbc51079733e9468cdfd1efcd7d196cd1d -Provides: bundled(golang(github.com/gorilla/mux)) = 98cb6bf42e086f6af920b965c38cacc07402d51b -Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-middleware)) = 3c51f7f332123e8be5a157c0802a228ac85bf9db -Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway)) = 1a03ca3bad1e1ebadaedd3abb76bc58d4ac8143b -Provides: bundled(golang(github.com/grpc-ecosystem/grpc-opentracing)) = 8e809c8a86450a29b90dcc9efbf062d0fe6d9746 -Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 7f827b33c0f158ec5dfbba01bb0b14a4541fd81d -Provides: bundled(golang(github.com/imdario/mergo)) = 1afb36080aec31e0d1528973ebe6721b191b0369 +# grep -v -e '^$' -e '^#' cli-23.0.4/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = f831d5a0822a1ad72420ab18c6269bca1ddaf490 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 4650843026a7fdec254a8d9cf893693a254edd0b +Provides: bundled(golang(github.com/Azure/go-autorest)) = eaa7994b2278094c904d31993d26f56324db3052 +Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 +Provides: bundled(golang(github.com/bshuster-repo/logrus-logstash-hook)) = d2c0ecc1836d91814e15e23bb5dc309c3ef51f4a +Provides: bundled(golang(github.com/bugsnag/bugsnag-go)) = b1d153021fcd90ca3f080db36bec96dc690fb274 +Provides: bundled(golang(github.com/bugsnag/osext)) = 0dd3f918b21bec95ace9dc86c7e70266cfc5c702 +Provides: bundled(golang(github.com/bugsnag/panicwrap)) = e2c28503fcd0675329da73bf48b33404db873782 +Provides: bundled(golang(github.com/denverdino/aliyungo)) = afedced274aa9a7fcdd47ac97018f0f8db4e5de2 +Provides: bundled(golang(github.com/dgrijalva/jwt-go)) = 4bbdd8ac624fc7a9ef7aec841c43d99b5fe65a29 +Provides: bundled(golang(github.com/docker/go-metrics)) = 399ea8c73916000c64c2c76e8da00ca82f8387ab +Provides: bundled(golang(github.com/docker/libtrust)) = fa567046d9b14f6aa788882a950d69651d230b21 +Provides: bundled(golang(github.com/garyburd/redigo)) = 535138d7bcd717d6531c701ef5933d98b1866257 +Provides: bundled(golang(github.com/go-ini/ini)) = 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c +Provides: bundled(golang(github.com/golang/protobuf)) = 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3 +Provides: bundled(golang(github.com/gorilla/handlers)) = 60c7bfde3e33c201519a200a4507a158cc03a17b +Provides: bundled(golang(github.com/gorilla/mux)) = 599cba5e7b6137d46ddf58fb1765f5d928e69604 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -Provides: bundled(golang(github.com/jaguilar/vt100)) = ad4c4a5743050fb7f88ce968dca9422f72a0e3f2 -Provides: bundled(golang(github.com/json-iterator/go)) = 024077e996b048517130b21ea6bf12aa23055d3d +Provides: bundled(golang(github.com/jmespath/go-jmespath)) = bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d +Provides: bundled(golang(github.com/marstr/guid)) = 8bd9a64bf37eb297b492a4101fb28e80ac0b290f Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c -Provides: bundled(golang(github.com/Microsoft/go-winio)) = 5b44b70ab3ab4d291a7c1d28afe7b4afeced0ed4 -Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 5bc557dd210ff2caf615e6e22d398123de77fc11 -Provides: bundled(golang(github.com/miekg/pkcs11)) = 210dc1e16747c5ba98a03bcbcf728c38086ea357 -Provides: bundled(golang(github.com/mitchellh/mapstructure)) = d16e9488127408e67948eb43b6d3fbb9f222da10 -Provides: bundled(golang(github.com/moby/buildkit)) = eeb7b65ab7d651770a5ec52a06ea7c96eb97a249 -Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab -Provides: bundled(golang(github.com/moby/term)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d -Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 -Provides: bundled(golang(github.com/modern-go/reflect2)) = 2b33151c9bbc5231aea69b8861c540102b087070 -Provides: bundled(golang(github.com/morikuni/aec)) = 39771216ff4c63d11f5e604076f9c45e8be1067b -Provides: bundled(golang(github.com/opencontainers/go-digest)) = ea51bea511f75cfa3ef6098cc253c5c3609b037a +Provides: bundled(golang(github.com/miekg/dns)) = 271c58e0c14f552178ea321a545ff9af38930f39 +Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 482a9fd5fa83e8c4e7817413b80f3eb8feec03ef +Provides: bundled(golang(github.com/ncw/swift)) = a0320860b16212c2b59b4912bb6508cda1d7cee6 +Provides: bundled(golang(github.com/opencontainers/go-digest)) = a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb Provides: bundled(golang(github.com/opencontainers/image-spec)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 -Provides: bundled(golang(github.com/opencontainers/runc)) = ff819c7e9184c13b7c2607fe6c30ae19403a7aff -Provides: bundled(golang(github.com/opentracing/opentracing-go)) = d34af3eaa63c4d08ab54863a4bdd0daa45212e12 -Provides: bundled(golang(github.com/pkg/errors)) = 614d223910a179a466c1767a985424175c39b465 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 6edbbd9e560190e318cdc5b4d3e630b442858380 -Provides: bundled(golang(github.com/prometheus/client_model)) = 7bc5445566f0fe75b15de23e6b93886e982d7bf9 -Provides: bundled(golang(github.com/prometheus/common)) = d978bcb1309602d68bb4ba69cf3f8ed900e07308 -Provides: bundled(golang(github.com/prometheus/procfs)) = 46159f73e74d1cb8dc223deef9b2d049286f46b1 -Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 4c9bf9512682b995722660a4196c0013228e2049 -Provides: bundled(golang(github.com/sirupsen/logrus)) = 6699a89a232f3db797f2e280639854bbc4b89725 -Provides: bundled(golang(github.com/spf13/cobra)) = 86f8bfd7fef868a174e1b606783bd7f5c82ddf8f -Provides: bundled(golang(github.com/spf13/pflag)) = 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab -Provides: bundled(golang(github.com/theupdateframework/notary)) = bf96a202a09a312ae005cd312fc06ff4d2c166ce -Provides: bundled(golang(github.com/tonistiigi/fsutil)) = 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9 -Provides: bundled(golang(github.com/tonistiigi/go-rosetta)) = f79598599c5d34ea253b56a1d7c89bc6a96de7db -Provides: bundled(golang(github.com/tonistiigi/units)) = 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2 -Provides: bundled(golang(github.com/xeipuuv/gojsonpointer)) = 02993c407bfbf5f6dae44c4f4b1cf6a39b5fc5bb -Provides: bundled(golang(github.com/xeipuuv/gojsonreference)) = bd5ef7bd5415a7ac448318e64f11a24cd21e594b -Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = 82fcdeb203eb6ab2a67d0a623d9c19e5e5a64927 -Provides: bundled(golang(golang.org/x/crypto)) = 642fcc37f5043eadb2509c84b2769e729e7d27ef -Provides: bundled(golang(golang.org/x/net)) = ab34263943818b32f575efc978a3d24e80b04bd7 -Provides: bundled(golang(golang.org/x/oauth2)) = bf48bf16ab8d622ce64ec6ce98d2c98f916b6303 -Provides: bundled(golang(golang.org/x/sync)) = cd5d95a43a6e21273425c7ae415d3df9ea832eeb -Provides: bundled(golang(golang.org/x/sys)) = 33da011f77ade50ff5b6a6fb4a9a1e6d6b285809 -Provides: bundled(golang(golang.org/x/term)) = f5c789dd3221ff39d752ac54467d762de7cfbec6 -Provides: bundled(golang(golang.org/x/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e -Provides: bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82 -Provides: bundled(golang(google.golang.org/genproto)) = 3f1135a288c9a07e340ae8ba4cc6c7065a3160e8 -Provides: bundled(golang(google.golang.org/grpc)) = f495f5b15ae7ccda3b38c53a1bfcde4c1a58a2bc -Provides: bundled(golang(go.opencensus.io)) = d835ff86be02193d324330acdb7d65546b05f814 -Provides: bundled(golang(gopkg.in/inf.v0)) = d2d2541c53f18d2a059457998ce2876cc8e67cbf -Provides: bundled(golang(gopkg.in/yaml.v2)) = 53403b58ad1b561927d19068c655246f2db79d48 -Provides: bundled(golang(gotest.tools/v3)) = bb0d8a963040ea5048dcef1a14d8f8b58a33d4b3 -Provides: bundled(golang(k8s.io/api)) = d49a3f108dab8e8d25f22c497fb48678b124efd2 -Provides: bundled(golang(k8s.io/apimachinery)) = f336d9be0221d10a93a7d6d2ec25f6fc799f4fc6 -Provides: bundled(golang(k8s.io/client-go)) = 002560d5bf54049bf5b5ae99231cb2b591f15954 -Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd945ec5f -Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 -Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 -Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 -# grep -v -e '^$' -e '^#' moby-20.10.23/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' -Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 -Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec -Provides: bundled(golang(github.com/armon/circbuf)) = 5111143e8da2e98b4ea6a8f32b9065ea1821c191 -Provides: bundled(golang(github.com/armon/go-metrics)) = f0300d1749da6fa982027e449ec0c7a145510c3c -Provides: bundled(golang(github.com/armon/go-radix)) = e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 -Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 2590bc875c54c9fda225d8e4e56a9d28d90c6a47 -Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 -Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 -Provides: bundled(golang(github.com/bsphere/le_go)) = 7a984a84b5492ae539b79b62fb4a10afc63c7bcf -Provides: bundled(golang(github.com/BurntSushi/toml)) = 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 -Provides: bundled(golang(github.com/cespare/xxhash/v2)) = d7df74196a9e781ede915320c11c378c1b2f3a1f -Provides: bundled(golang(github.com/cilium/ebpf)) = 32458a752e0bcbc670691625f84e7ef6aef5655d -Provides: bundled(golang(github.com/cloudflare/cfssl)) = 5d63dbd981b5c408effbb58c442d54761ff94fbd -Provides: bundled(golang(github.com/containerd/cgroups)) = b9de8a2212026c07cec67baf3323f1fc0121e048 -Provides: bundled(golang(github.com/containerd/console)) = 2f1e3d2b6afd18e8b2077816c711205a0b4d8769 -Provides: bundled(golang(github.com/containerd/containerd)) = 96c5ae04b6784e180aaeee50fba715ac448ddb0d -Provides: bundled(golang(github.com/containerd/continuity)) = 5ad51c7aca47b8e742f5e6e7dc841d50f5f6affd -Provides: bundled(golang(github.com/containerd/fifo)) = 0724c46b320cf96bb172a0550c19a4b1fca4dacb -Provides: bundled(golang(github.com/containerd/go-runc)) = 16b287bc67d069a60fa48db15f330b790b74365b -Provides: bundled(golang(github.com/containerd/ttrpc)) = bfba540dc45464586c106b1f31c8547933c1eb41 -Provides: bundled(golang(github.com/containerd/typeurl)) = cd3ce7159eae562a4f60ceff37dada11a939d247 -Provides: bundled(golang(github.com/coreos/etcd)) = 973882f697a8db3d59815bf132c6c506434334bd -Provides: bundled(golang(github.com/coreos/go-semver)) = 8ab6407b697782a06568d4b7f1db25550ec2e4c6 -Provides: bundled(golang(github.com/coreos/go-systemd)) = 39ca1b05acc7ad1220e09f133283b8859a8b71ab -Provides: bundled(golang(github.com/coreos/go-systemd/v22)) = 2d78030078ef61b3cae27f42ad6d0e46db51b339 -Provides: bundled(golang(github.com/coreos/pkg)) = 3ac0863d7acf3bc44daf49afef8919af12f704ef -Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc -Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = a261ee33d7a517f054effbf451841abaafe3e0fd -Provides: bundled(golang(github.com/deckarep/golang-set)) = ef32fa3046d9f249d399f98ebaf9be944430fd1d -Provides: bundled(golang(github.com/docker/distribution)) = b5ca020cfbe998e5af3457fda087444cf5116496 -Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 -Provides: bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa76fe4ac244571fab96ae47f -Provides: bundled(golang(github.com/docker/go-metrics)) = b619b3592b65de4f087d9f16863a7e6ff905973c -Provides: bundled(golang(github.com/docker/go-units)) = 519db1ee28dcc9fd2474ae59fca29a810482bfb1 -Provides: bundled(golang(github.com/docker/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b -Provides: bundled(golang(github.com/docker/libnetwork)) = 05b93e0d3a95952f70c113b0bc5bdb538d7afdd7 -Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a -Provides: bundled(golang(github.com/docker/swarmkit)) = cf1e0f8d95ee37ea1f9a5f8a54c73c1e0fa58a54 -Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 -Provides: bundled(golang(github.com/fluent/fluent-logger-golang)) = 0b652e850a9140d0b1db6390d8925d0601e952db -Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 45d7d09e39ef4ac08d493309fa031790c15bfe8a -Provides: bundled(golang(github.com/godbus/dbus/v5)) = 37bf87eef99d69c4f1d3528bd66e3a87dc201472 -Provides: bundled(golang(github.com/gofrs/flock)) = 6caa7350c26b838538005fae7dbee4e69d9398db -Provides: bundled(golang(github.com/gogo/googleapis)) = 01e0f9cca9b92166042241267ee2a5cdf5cff46c -Provides: bundled(golang(github.com/gogo/protobuf)) = 5628607bb4c51c3157aacc3a50f0ab707582b805 -Provides: bundled(golang(github.com/golang/gddo)) = 72a348e765d293ed6d1ded7b699591f14d6cd921 -Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6baa9cfbc11732cdf6546b17c1298 -Provides: bundled(golang(github.com/golang/protobuf)) = 84668698ea25b64748563aa20726db66a6b8d299 -Provides: bundled(golang(github.com/googleapis/gax-go)) = bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2 -Provides: bundled(golang(github.com/google/btree)) = 4030bb1f1f0c35b30ca7009e9ebd06849dd45306 -Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 37a384cd035e722ea46e55029093e26687138edf -Provides: bundled(golang(github.com/google/go-cmp)) = 3af367b6b30c263d47e8895973edcca9a49cf029 -Provides: bundled(golang(github.com/google/shlex)) = e7afc7fbc51079733e9468cdfd1efcd7d196cd1d -Provides: bundled(golang(github.com/google/uuid)) = 0cd6bf5da1e1c83f8b45653022c74f71af0538a4 -Provides: bundled(golang(github.com/gorilla/mux)) = 98cb6bf42e086f6af920b965c38cacc07402d51b -Provides: bundled(golang(github.com/Graylog2/go-gelf)) = 1550ee647df0510058c9d67a45c56f18911d80b8 -Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-middleware)) = 3c51f7f332123e8be5a157c0802a228ac85bf9db -Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) = c225b8c3b01faf2899099b768856a9e916e5087b -Provides: bundled(golang(github.com/grpc-ecosystem/grpc-opentracing)) = 8e809c8a86450a29b90dcc9efbf062d0fe6d9746 -Provides: bundled(golang(github.com/hashicorp/consul)) = 9a9cc9341bb487651a0399e3fc5e1e8a42e62dd9 -Provides: bundled(golang(github.com/hashicorp/errwrap)) = 8a6fb523712970c966eefc6b39ed2c5e74880354 -Provides: bundled(golang(github.com/hashicorp/go-immutable-radix)) = 826af9ccf0feeee615d546d69b11f8e98da8c8f1 -Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 7f827b33c0f158ec5dfbba01bb0b14a4541fd81d -Provides: bundled(golang(github.com/hashicorp/go-memdb)) = cb9a474f84cc5e41b273b20c6927680b2a8776ad -Provides: bundled(golang(github.com/hashicorp/go-msgpack)) = 71c2886f5a673a35f909803f38ece5810165097b -Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 886a7fbe3eb1c874d46f623bfa70af45f425b3d1 -Provides: bundled(golang(github.com/hashicorp/go-sockaddr)) = c7188e74f6acae5a989bdc959aa779f8b9f42faf -Provides: bundled(golang(github.com/hashicorp/memberlist)) = e6ff9b2d87a3f0f3f04abb5672ada3ac2a640223 -Provides: bundled(golang(github.com/hashicorp/serf)) = 598c54895cc5a7b1a24a398d635e8c0ea0959870 -Provides: bundled(golang(github.com/imdario/mergo)) = 1afb36080aec31e0d1528973ebe6721b191b0369 +Provides: bundled(golang(github.com/prometheus/client_golang)) = c332b6f63c0658a65eca15c0e5247ded801cf564 +Provides: bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c +Provides: bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563 +Provides: bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd +Provides: bundled(golang(github.com/satori/go.uuid)) = f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 +Provides: bundled(golang(github.com/Shopify/logrus-bugsnag)) = 577dee27f20dd8f1a529f82210094af593be12bd +Provides: bundled(golang(github.com/sirupsen/logrus)) = 3d4380f53a34dcdc95f0c1db702615992b38d9a4 +Provides: bundled(golang(github.com/spf13/cobra)) = 312092086bed4968099259622145a0c9ae280064 +Provides: bundled(golang(github.com/spf13/pflag)) = 5644820622454e71517561946e3d94b9f9db6842 +Provides: bundled(golang(github.com/xenolf/lego)) = a9d8cec0e6563575e5868a005359ac97911b5985 +Provides: bundled(golang(github.com/yvasiyarov/go-metrics)) = 57bccd1ccd43f94bb17fdd8bf3007059b802f85e +Provides: bundled(golang(github.com/yvasiyarov/gorelic)) = a9bba5b9ab508a086f9a12b8c51fab68478e2128 +Provides: bundled(golang(github.com/yvasiyarov/newrelic_platform_go)) = b21fdbd4370f3717f3bbd2bf41c223bc273068e6 +Provides: bundled(golang(golang.org/x/crypto)) = c10c31b5e94b6f7a0283272dc2bb27163dcea24b +Provides: bundled(golang(golang.org/x/net)) = 4876518f9e71663000c348837735820161a42df7 +Provides: bundled(golang(golang.org/x/oauth2)) = 045497edb6234273d67dbc25da3f2ddbc4c4cacf +Provides: bundled(golang(golang.org/x/time)) = a4bde12657593d5e90d0533a3e4fd95e635124cb +Provides: bundled(golang(google.golang.org/api)) = 9bf6e6e569ff057f75d9604a46c52928f17d2b54 +Provides: bundled(golang(google.golang.org/appengine)) = 12d5545dc1cfa6047a286d5e853841b6471f4c19 +Provides: bundled(golang(google.golang.org/cloud)) = 975617b05ea8a58727e6c1a06b6161ff4185a9f2 +Provides: bundled(golang(google.golang.org/grpc)) = d3ddb4469d5a1b949fc7a7da7c1d6a0d1b6de994 +Provides: bundled(golang(gopkg.in/check.v1)) = 64131543e7896d5bcc6bd5a76287eb75ea96c673 +Provides: bundled(golang(gopkg.in/square/go-jose.v1)) = 40d457b439244b546f023d056628e5184136899b +Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1 +Provides: bundled(golang(rsc.io/letsencrypt)) = e770c10b0f1a64775ae91d240407ce00d1a5bdeb +# grep -v -e '^$' -e '^#' moby-23.0.4/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = f831d5a0822a1ad72420ab18c6269bca1ddaf490 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 4650843026a7fdec254a8d9cf893693a254edd0b +Provides: bundled(golang(github.com/Azure/go-autorest)) = eaa7994b2278094c904d31993d26f56324db3052 +Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 +Provides: bundled(golang(github.com/bshuster-repo/logrus-logstash-hook)) = d2c0ecc1836d91814e15e23bb5dc309c3ef51f4a +Provides: bundled(golang(github.com/bugsnag/bugsnag-go)) = b1d153021fcd90ca3f080db36bec96dc690fb274 +Provides: bundled(golang(github.com/bugsnag/osext)) = 0dd3f918b21bec95ace9dc86c7e70266cfc5c702 +Provides: bundled(golang(github.com/bugsnag/panicwrap)) = e2c28503fcd0675329da73bf48b33404db873782 +Provides: bundled(golang(github.com/denverdino/aliyungo)) = afedced274aa9a7fcdd47ac97018f0f8db4e5de2 +Provides: bundled(golang(github.com/dgrijalva/jwt-go)) = 4bbdd8ac624fc7a9ef7aec841c43d99b5fe65a29 +Provides: bundled(golang(github.com/docker/go-metrics)) = 399ea8c73916000c64c2c76e8da00ca82f8387ab +Provides: bundled(golang(github.com/docker/libtrust)) = fa567046d9b14f6aa788882a950d69651d230b21 +Provides: bundled(golang(github.com/garyburd/redigo)) = 535138d7bcd717d6531c701ef5933d98b1866257 +Provides: bundled(golang(github.com/go-ini/ini)) = 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c +Provides: bundled(golang(github.com/golang/protobuf)) = 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3 +Provides: bundled(golang(github.com/gorilla/handlers)) = 60c7bfde3e33c201519a200a4507a158cc03a17b +Provides: bundled(golang(github.com/gorilla/mux)) = 599cba5e7b6137d46ddf58fb1765f5d928e69604 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -Provides: bundled(golang(github.com/ishidawataru/sctp)) = f2269e66cdee387bd321445d5d300893449805be -Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 2d053f87d1d7f9f48196ae04cf3daea4273d207d -Provides: bundled(golang(github.com/json-iterator/go)) = a1ca0830781e007c66b225121d2cdb3a649421f6 +Provides: bundled(golang(github.com/jmespath/go-jmespath)) = bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d +Provides: bundled(golang(github.com/marstr/guid)) = 8bd9a64bf37eb297b492a4101fb28e80ac0b290f Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c -Provides: bundled(golang(github.com/Microsoft/go-winio)) = 7e149e8c70409f36773c1b2cf3447a7ab7697368 -Provides: bundled(golang(github.com/Microsoft/hcsshim)) = a11a2c44e8a4aa9d66314b1d759ef582df5ab5e8 -Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36014584a6f664344e3bb0aa64 -Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 -Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb -Provides: bundled(golang(github.com/mitchellh/hashstructure)) = a38c50148365edc8df43c1580c48fb2b3a1e9cd7 -Provides: bundled(golang(github.com/moby/buildkit)) = eeb7b65ab7d651770a5ec52a06ea7c96eb97a249 -Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 -Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe -Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab -Provides: bundled(golang(github.com/moby/term)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d -Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 -Provides: bundled(golang(github.com/modern-go/reflect2)) = 94122c33edd36123c84d5368cfb2b69df93a0ec8 -Provides: bundled(golang(github.com/morikuni/aec)) = 39771216ff4c63d11f5e604076f9c45e8be1067b -Provides: bundled(golang(github.com/opencontainers/go-digest)) = ea51bea511f75cfa3ef6098cc253c5c3609b037a +Provides: bundled(golang(github.com/miekg/dns)) = 271c58e0c14f552178ea321a545ff9af38930f39 +Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 482a9fd5fa83e8c4e7817413b80f3eb8feec03ef +Provides: bundled(golang(github.com/ncw/swift)) = a0320860b16212c2b59b4912bb6508cda1d7cee6 +Provides: bundled(golang(github.com/opencontainers/go-digest)) = a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb Provides: bundled(golang(github.com/opencontainers/image-spec)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 -Provides: bundled(golang(github.com/opencontainers/runc)) = ff819c7e9184c13b7c2607fe6c30ae19403a7aff -Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = 4d89ac9fbff6c455f46a5bb59c6b1bb7184a5e43 -Provides: bundled(golang(github.com/opencontainers/selinux)) = 2f45b3796d18f1ab4c9fc0c888a98d0a0fd6e429 -Provides: bundled(golang(github.com/opentracing-contrib/go-stdlib)) = 8a6ff1ad1691a29e4f7b5d46604f97634997c8c4 -Provides: bundled(golang(github.com/opentracing/opentracing-go)) = d34af3eaa63c4d08ab54863a4bdd0daa45212e12 -Provides: bundled(golang(github.com/philhofer/fwd)) = bb6d471dc95d4fe11e432687f8b70ff496cf3136 -Provides: bundled(golang(github.com/pkg/errors)) = 614d223910a179a466c1767a985424175c39b465 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 6edbbd9e560190e318cdc5b4d3e630b442858380 -Provides: bundled(golang(github.com/prometheus/client_model)) = 7bc5445566f0fe75b15de23e6b93886e982d7bf9 -Provides: bundled(golang(github.com/prometheus/common)) = d978bcb1309602d68bb4ba69cf3f8ed900e07308 -Provides: bundled(golang(github.com/prometheus/procfs)) = 46159f73e74d1cb8dc223deef9b2d049286f46b1 -Provides: bundled(golang(github.com/RackSec/srslog)) = a4725f04ec91af1a91b380da679d6e0c2f061e59 -Provides: bundled(golang(github.com/samuel/go-zookeeper)) = d0e0d8e11f318e000a8cc434616d69e329edc374 -Provides: bundled(golang(github.com/sean-/seed)) = e2103e2c35297fb7e17febb81e49b312087a2372 -Provides: bundled(golang(github.com/sirupsen/logrus)) = 6699a89a232f3db797f2e280639854bbc4b89725 -Provides: bundled(golang(github.com/spf13/cobra)) = 86f8bfd7fef868a174e1b606783bd7f5c82ddf8f -Provides: bundled(golang(github.com/spf13/pflag)) = 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab -Provides: bundled(golang(github.com/syndtr/gocapability)) = 42c35b4376354fd554efc7ad35e0b7f94e3a0ffb -Provides: bundled(golang(github.com/tchap/go-patricia)) = a7f0089c6f496e8e70402f61733606daa326cac5 -Provides: bundled(golang(github.com/tinylib/msgp)) = af6442a0fcf6e2a1b824f70dd0c734f01e817751 -Provides: bundled(golang(github.com/tonistiigi/fsutil)) = 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9 -Provides: bundled(golang(github.com/tonistiigi/units)) = 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2 -Provides: bundled(golang(github.com/vbatts/tar-split)) = 80a436fd6164c557b131f7c59ed69bd81af69761 -Provides: bundled(golang(github.com/vishvananda/netlink)) = f049be6f391489d3f374498fe0c8df8449258372 -Provides: bundled(golang(github.com/vishvananda/netns)) = db3c7e526aae966c4ccfa6c8189b693d6ac5d202 -Provides: bundled(golang(github.com/willf/bitset)) = 559910e8471e48d76d9e5a1ba15842dee77ad45d -Provides: bundled(golang(go.etcd.io/bbolt)) = 232d8fc87f50244f9c808f4745759e08a304c029 -Provides: bundled(golang(golang.org/x/crypto)) = c1f2f97bffc9c53fc40a1a28a5b460094c0050d9 -Provides: bundled(golang(golang.org/x/net)) = ab34263943818b32f575efc978a3d24e80b04bd7 -Provides: bundled(golang(golang.org/x/oauth2)) = bf48bf16ab8d622ce64ec6ce98d2c98f916b6303 -Provides: bundled(golang(golang.org/x/sync)) = cd5d95a43a6e21273425c7ae415d3df9ea832eeb -Provides: bundled(golang(golang.org/x/sys)) = 33da011f77ade50ff5b6a6fb4a9a1e6d6b285809 -Provides: bundled(golang(golang.org/x/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e -Provides: bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82 -Provides: bundled(golang(google.golang.org/api)) = dec2ee309f5b09fc59bc40676447c15736284d78 -Provides: bundled(golang(google.golang.org/genproto)) = 3f1135a288c9a07e340ae8ba4cc6c7065a3160e8 -Provides: bundled(golang(google.golang.org/grpc)) = f495f5b15ae7ccda3b38c53a1bfcde4c1a58a2bc -Provides: bundled(golang(go.opencensus.io)) = d835ff86be02193d324330acdb7d65546b05f814 -Provides: bundled(golang(gotest.tools/v3)) = 568bc57cc5c19a2ef85e5749870b49a4cc2ab54d +Provides: bundled(golang(github.com/prometheus/client_golang)) = c332b6f63c0658a65eca15c0e5247ded801cf564 +Provides: bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c +Provides: bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563 +Provides: bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd +Provides: bundled(golang(github.com/satori/go.uuid)) = f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 +Provides: bundled(golang(github.com/Shopify/logrus-bugsnag)) = 577dee27f20dd8f1a529f82210094af593be12bd +Provides: bundled(golang(github.com/sirupsen/logrus)) = 3d4380f53a34dcdc95f0c1db702615992b38d9a4 +Provides: bundled(golang(github.com/spf13/cobra)) = 312092086bed4968099259622145a0c9ae280064 +Provides: bundled(golang(github.com/spf13/pflag)) = 5644820622454e71517561946e3d94b9f9db6842 +Provides: bundled(golang(github.com/xenolf/lego)) = a9d8cec0e6563575e5868a005359ac97911b5985 +Provides: bundled(golang(github.com/yvasiyarov/go-metrics)) = 57bccd1ccd43f94bb17fdd8bf3007059b802f85e +Provides: bundled(golang(github.com/yvasiyarov/gorelic)) = a9bba5b9ab508a086f9a12b8c51fab68478e2128 +Provides: bundled(golang(github.com/yvasiyarov/newrelic_platform_go)) = b21fdbd4370f3717f3bbd2bf41c223bc273068e6 +Provides: bundled(golang(golang.org/x/crypto)) = c10c31b5e94b6f7a0283272dc2bb27163dcea24b +Provides: bundled(golang(golang.org/x/net)) = 4876518f9e71663000c348837735820161a42df7 +Provides: bundled(golang(golang.org/x/oauth2)) = 045497edb6234273d67dbc25da3f2ddbc4c4cacf +Provides: bundled(golang(golang.org/x/time)) = a4bde12657593d5e90d0533a3e4fd95e635124cb +Provides: bundled(golang(google.golang.org/api)) = 9bf6e6e569ff057f75d9604a46c52928f17d2b54 +Provides: bundled(golang(google.golang.org/appengine)) = 12d5545dc1cfa6047a286d5e853841b6471f4c19 +Provides: bundled(golang(google.golang.org/cloud)) = 975617b05ea8a58727e6c1a06b6161ff4185a9f2 +Provides: bundled(golang(google.golang.org/grpc)) = d3ddb4469d5a1b949fc7a7da7c1d6a0d1b6de994 +Provides: bundled(golang(gopkg.in/check.v1)) = 64131543e7896d5bcc6bd5a76287eb75ea96c673 +Provides: bundled(golang(gopkg.in/square/go-jose.v1)) = 40d457b439244b546f023d056628e5184136899b +Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1 +Provides: bundled(golang(rsc.io/letsencrypt)) = e770c10b0f1a64775ae91d240407ce00d1a5bdeb diff --git a/sources b/sources index d2a6e31..511d30c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (moby-20.10.23.tar.gz) = f6e13a275c7f368e90779b2bae4ded98c8949f398934fb249b10958973d86aaa3bc10a868fa64eb245e35ddb36ff14a89f6b20ff274e7e3b57a57daffa00c26d -SHA512 (cli-20.10.23.tar.gz) = c1debb583e9464d51ef482de29f63d6df1815eaae18cd66e5b4b36dee324f8c5c699134eee13ed4882e24aadaac37483a37e6729b734a60510271b107dc31cf0 -SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb +SHA512 (moby-23.0.4.tar.gz) = 94d2c748541cf402197e98f93f574daf72bd84fc7603bf30e23674be36862ddbff5f37ad667455a710d730b9c5bc11962c287d6fd60a20320e0e0a41e3329c44 +SHA512 (cli-23.0.4.tar.gz) = ef9ab03258e4c858cac61767ddddb7319c8c3a33d08fdf416fda78db017457003344e06cb7701c9277557a6fb2a73285a7cd5ce3a0af0323ed2dd4edfc28f703 +SHA512 (tini-0b44d36.tar.gz) = 5294e877c369177b09c2a34f759e911f612f6977e960a63d46b6e5ebea790455dad972e91ca10c478693da637a5479d4e0b904efcfb5ae291e87e7e66674c752 diff --git a/update.sh b/update.sh index 8c78a70..3089ca4 100755 --- a/update.sh +++ b/update.sh @@ -15,6 +15,7 @@ if command -v update.sh && [ "$#" -gt 0 ]; then update.sh "$@" fi +spectool -g moby-engine.spec --define "_sourcedir ." fedpkg prep version="$(rpmspec -D '_sourcedir %(pwd)' -q --srpm --qf '%{version}\n' *.spec)" @@ -24,16 +25,16 @@ cat << EOF > provides.spec.inc Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-${version}/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' +# grep -v -e '^$' -e '^#' cli-${version}/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' EOF -grep -v -e '^$' -e '^#' "moby-${version}/cli-${version}/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc +grep -v -e '^$' -e '^#' "moby-${version}/cli-${version}/vendor/github.com/docker/distribution/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc cat << EOF >> provides.spec.inc -# grep -v -e '^$' -e '^#' moby-${version}/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' +# grep -v -e '^$' -e '^#' moby-${version}/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' EOF -grep -v -e '^$' -e '^#' "moby-${version}/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc +grep -v -e '^$' -e '^#' "moby-${version}/vendor/github.com/docker/distribution/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc # Note(gotmax23): Ignore this also. My script commits the specfile, # and then this ammends that commit to add the updated provides.spec.inc.