commit f0227c2b0c02e4c355863371a568d07e7de5bb9f Author: Lokesh Mandvekar <l...@fedoraproject.org> Date: Thu Mar 5 09:27:46 2015 -0600
merge -pkg-devel into -devel, update golang provides NVR: docker-io-1.5.0-2 Signed-off-by: Lokesh Mandvekar <l...@fedoraproject.org> docker-io.spec | 229 ++++++++++++++++++++++++++------------------------------- 1 file changed, 105 insertions(+), 124 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 05d1193..98d4dd6 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -42,10 +42,7 @@ BuildRequires: golang(code.google.com/p/go.net/websocket) BuildRequires: golang(code.google.com/p/gosqlite/sqlite3) # Resolves: rhbz#1109039 use syndtr/gocapability >= 0-0.7 BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.7 -#BuildRequires: golang(github.com/docker/libcontainer) >= 1.2.0-3 BuildRequires: golang(github.com/tchap/go-patricia/patricia) -BuildRequires: golang(github.com/docker/libtrust) >= 0-0.2 -BuildRequires: golang(github.com/docker/libtrust/trustgraph) >= 0-0.2 BuildRequires: golang(github.com/Sirupsen/logrus) >= 0.6.0 BuildRequires: go-md2man BuildRequires: device-mapper-devel @@ -83,113 +80,107 @@ servers, OpenStack clusters, public instances, or combinations of the above. %package devel BuildRequires: golang >= 1.2.1-3 -Requires: golang >= 1.2.1-3 -Requires: %{name}-pkg-devel -Provides: %{repo}-devel -Summary: A golang registry for global request variables (source libraries) -Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/api) = %{version}-%{release} -Provides: golang(%{import_path}/api/client) = %{version}-%{release} -Provides: golang(%{import_path}/api/server) = %{version}-%{release} -Provides: golang(%{import_path}/builder) = %{version}-%{release} -Provides: golang(%{import_path}/builder/parser) = %{version}-%{release} -Provides: golang(%{import_path}/builder/parser/dumper) = %{version}-%{release} -Provides: golang(%{import_path}/builtins) = %{version}-%{release} -Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release} -Provides: golang(%{import_path}/contrib/host-integration) = %{version}-%{release} -Provides: golang(%{import_path}/daemon) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver/btrfs) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver/devmapper) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver/graphtest) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver/vfs) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/networkdriver) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/networkdriver/bridge) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/networkdriver/ipallocator) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/networkdriver/portallocator) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/networkdriver/portmapper) = %{version}-%{release} -Provides: golang(%{import_path}/docker) = %{version}-%{release} -Provides: golang(%{import_path}/dockerinit) = %{version}-%{release} -Provides: golang(%{import_path}/dockerversion) = %{version}-%{release} -Provides: golang(%{import_path}/engine) = %{version}-%{release} -Provides: golang(%{import_path}/events) = %{version}-%{release} -Provides: golang(%{import_path}/graph) = %{version}-%{release} -Provides: golang(%{import_path}/image) = %{version}-%{release} -Provides: golang(%{import_path}/links) = %{version}-%{release} -Provides: golang(%{import_path}/nat) = %{version}-%{release} -Provides: golang(%{import_path}/opts) = %{version}-%{release} -Provides: golang(%{import_path}/registry) = %{version}-%{release} -Provides: golang(%{import_path}/runconfig) = %{version}-%{release} -Provides: golang(%{import_path}/trust) = %{version}-%{release} -Provides: golang(%{import_path}/utils) = %{version}-%{release} -Provides: golang(%{import_path}/volumes) = %{version}-%{release} -Provides: golang(%{import_path}/vendor/src/%{tar_import_path}) = %{version}-%{release} +Requires: golang >= 1.2.1-3 +Provides: %{repo}-devel +Provides: %{repo}-pkg-devel +Provides: %{name}-pkg-devel +Provides: golang(%{import_path}/vendor/src/%{tar_import_path}) = %{version}-%{release} +Summary: A golang registry for global request variables (source libraries) +Provides: golang(%{import_path}) = %{version}-%{release} +Provides: golang(%{import_path}/builder) = %{version}-%{release} +Provides: golang(%{import_path}/builder/parser) = %{version}-%{release} +Provides: golang(%{import_path}/builder/parser/dumper) = %{version}-%{release} +Provides: golang(%{import_path}/builder/command) = %{version}-%{release} +Provides: golang(%{import_path}/nat) = %{version}-%{release} +Provides: golang(%{import_path}/utils) = %{version}-%{release} +Provides: golang(%{import_path}/integration-cli) = %{version}-%{release} +Provides: golang(%{import_path}/trust) = %{version}-%{release} +Provides: golang(%{import_path}/events) = %{version}-%{release} +Provides: golang(%{import_path}/volumes) = %{version}-%{release} +Provides: golang(%{import_path}/dockerinit) = %{version}-%{release} +Provides: golang(%{import_path}/engine) = %{version}-%{release} +Provides: golang(%{import_path}/registry) = %{version}-%{release} +Provides: golang(%{import_path}/registry/v2) = %{version}-%{release} +Provides: golang(%{import_path}/api) = %{version}-%{release} +Provides: golang(%{import_path}/api/client) = %{version}-%{release} +Provides: golang(%{import_path}/api/stats) = %{version}-%{release} +Provides: golang(%{import_path}/api/server) = %{version}-%{release} +Provides: golang(%{import_path}/opts) = %{version}-%{release} +Provides: golang(%{import_path}/builtins) = %{version}-%{release} +Provides: golang(%{import_path}/runconfig) = %{version}-%{release} +Provides: golang(%{import_path}/docker) = %{version}-%{release} +Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release} +Provides: golang(%{import_path}/contrib/host-integration) = %{version}-%{release} +Provides: golang(%{import_path}/daemon) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/devmapper) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/overlay) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/vfs) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/btrfs) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/graphtest) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/networkdriver) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/networkdriver/ipallocator) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/networkdriver/portmapper) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/networkdriver/bridge) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/networkdriver/portallocator) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/devicemapper) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/units) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/chrootarchive) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/mount) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/systemd) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/parsers) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/parsers/kernel) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/parsers/operatingsystem) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/parsers/filters) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/broadcastwriter) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/stdcopy) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/promise) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/pools) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/system) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/fileutils) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/mflag) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/mflag/example) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/timeutils) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/pubsub) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/signal) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/version) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/httputils) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/urlutil) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/sysinfo) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/archive) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/tailfile) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/tarsum) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/namesgenerator) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/jsonlog) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/testutils) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/homedir) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/symlink) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/networkfs/resolvconf) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/networkfs/etchosts) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/term) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/reexec) = %{version}-%{release} +Provides: golang(%{import_path}/integration) = %{version}-%{release} +Provides: golang(%{import_path}/links) = %{version}-%{release} +Provides: golang(%{import_path}/image) = %{version}-%{release} +Provides: golang(%{import_path}/graph) = %{version}-%{release} %description devel %{summary} This package provides the source libraries for docker. -%package pkg-devel -BuildRequires: golang >= 1.2.1-3 -Requires: golang >= 1.2.1-3 -Provides: %{repo}-pkg-devel = %{version}-%{release} -Summary: A golang registry for global request variables (source libraries) -Provides: golang(%{import_path}/pkg/archive) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/broadcastwriter) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/chrootarchive) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/devicemapper) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/fileutils) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/httputils) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/jsonlog) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/mflag) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/mflag/example) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/mount) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/namesgenerator) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/networkfs/etchosts) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/networkfs/resolvconf) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/parsers) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/parsers/filters) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/parsers/kernel) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/parsers/operatingsystem) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/pools) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/promise) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/reexec) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/signal) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/stdcopy) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/symlink) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/sysinfo) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/system) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/systemd) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/tailfile) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/tarsum) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/term) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/testutils) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/timeutils) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/units) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/urlutil) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/version) = %{version}-%{release} - -%description pkg-devel -%{summary} - -These source libraries are provided by docker, but are independent of docker -specific logic. -The import paths of import_path/pkg/... - %package fish-completion Summary: fish completion files for docker Requires: %{name} = %{version}-%{release} @@ -228,7 +219,6 @@ This package installs %{summary}. %prep %setup -qn %{repo}-%{version} -#rm -rf vendor/src/github.com/{coreos,docker/libtrust,godbus,gorilla,kr,Sirupsen,syndtr,tchap} %patch0 -p1 cp %{SOURCE5} . @@ -302,22 +292,18 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/docker-network install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage -# sources -install -d -p %{buildroot}%{gopath}/src/%{import_path} -rm -rf pkg/symlink/testdata - -for dir in api builder builtins contrib/docker-device-tool \ - contrib/host-integration daemon docker dockerinit \ - dockerversion engine events graph \ - image links nat opts pkg registry runconfig \ - trust utils volumes -do - cp -rpav $dir %{buildroot}%{gopath}/src/%{import_path}/ -done - +# install tar_import_path to devel package install -d -p %{buildroot}%{gopath}/src/%{import_path}/vendor/src/%{tar_import_path} cp -rpav vendor/src/%{tar_import_path}/* %{buildroot}%{gopath}/src/%{import_path}/vendor/src/%{tar_import_path} +# remove dirs that won't be installed in devel +rm -rf vendor docs _build bundles contrib/init hack project + +# install sources to devel +for dir in */ ; do + cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/ +done + # install docker config directory install -dp %{buildroot}%{_sysconfdir}/%{repo} @@ -366,12 +352,6 @@ exit 0 %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %{gopath}/src/%{import_path} -%files pkg-devel -%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%dir %{gopath}/src/%{import_path} -%{gopath}/src/%{import_path}/pkg - %files fish-completion %dir %{_datadir}/fish/vendor_completions.d/ %{_datadir}/fish/vendor_completions.d/docker.fish @@ -391,6 +371,7 @@ exit 0 %changelog * Tue Feb 10 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 1.5.0-2 - include arm builds +- merge -pkg-devel into -devel * Tue Feb 10 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 1.5.0-1 - Resolves: rhbz#1191438 - update to v1.5.0 _______________________________________________ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang