commit b953cc419129304f8b521fe029b6dbdc78c0c623
Author: Lokesh Mandvekar <l...@fedoraproject.org>
Date:   Wed Feb 11 18:51:08 2015 +0100

    merge pkg-devel into devel
    
    Signed-off-by: Lokesh Mandvekar <l...@fedoraproject.org>

 docker-io.spec |  114 ++++---------------------------------------------------
 1 files changed, 9 insertions(+), 105 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 1bbc3c6..6084ae1 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -18,7 +18,7 @@
 
 Name:       %{repo}-io
 Version:       1.5.0
-Release:       1.git%{shortcommit}%{?dist}
+Release:       2.git%{shortcommit}%{?dist}
 Summary:    Automates deployment of containerized applications
 License:    ASL 2.0
 URL:        http://www.docker.com
@@ -66,111 +66,17 @@ 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
+Provides:   %{name}-pkg-devel
+Provides:   %{repo}-pkg-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}
 
 %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/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}
@@ -345,12 +251,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
@@ -368,10 +268,14 @@ exit 0
 %{_datadir}/zsh/site-functions/_docker
 
 %changelog
-* Wed Feb 11 2015 l...@riseup.net - 1.5.0-1
+* Wed Feb 11 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 
1.5.0-2.git54b59c2
+- provide golang paths only upto the repo's root dir
+- merge pkg-devel into devel
+
+* Wed Feb 11 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 1.5.0-1
 - New version: 1.5.0, built commit#54b59c2
 
-* Tue Feb 10 2015 l...@riseup.net - 1.4.1-27.git76baa35
+* Tue Feb 10 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 
1.4.1-27.git76baa35
 - daily rebuild - Tue Feb 10 01:19:10 CET 2015
 
 * Mon Feb 09 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 
1.4.1-26.gitc03d6f5
_______________________________________________
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang

Reply via email to