[golang-googlecode-sqlite] archfulness and defattr for el6 only, do not own golang dirs
by Lokesh Mandvekar
commit 4021babfd3ac4ca81c3c5d12cdb29f0c5e026921
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Jul 31 18:41:54 2014 -0500
archfulness and defattr for el6 only, do not own golang dirs
golang-googlecode-sqlite.spec | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/golang-googlecode-sqlite.spec b/golang-googlecode-sqlite.spec
index a37aff2..281c924 100644
--- a/golang-googlecode-sqlite.spec
+++ b/golang-googlecode-sqlite.spec
@@ -12,11 +12,7 @@ License: BSD
URL: http://%{import_path}
Source0: https://gosqlite.googlecode.com/archive/%{rev}.zip
Source1: LICENSE-BSD3-Go
-%if 0%{?fedora} >= 19
BuildArch: noarch
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
%description
%{summary}
@@ -53,19 +49,18 @@ for d in sqlite sqlite3; do
done
%files devel
-%defattr(-,root,root,-)
%doc LICENSE
-%dir %attr(755,root,root) %{gopath}
-%dir %attr(755,root,root) %{gopath}/src
-%dir %attr(755,root,root) %{gopath}/src/code.google.com
-%dir %attr(755,root,root) %{gopath}/src/code.google.com/p
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}/sqlite
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}/sqlite3
+%dir %{gopath}/src/%{import_path}
+%dir %{gopath}/src/%{import_path}/sqlite
+%dir %{gopath}/src/%{import_path}/sqlite3
%{gopath}/src/%{import_path}/sqlite/*.go
%{gopath}/src/%{import_path}/sqlite3/*.go
%changelog
+* Sun Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.11.hg74691fb6f837
+- archfulness and defattr for el6 only
+- do not own dirs owned by golang
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0-0.10.hg74691fb6f837
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[golang-github-gorilla-context/el6] defattr and archfulness for el6
by Lokesh Mandvekar
commit d5c35a4b163655e38c3535aaa352e9f0ed86993c
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Jul 31 18:25:11 2014 -0500
defattr and archfulness for el6
golang-github-gorilla-context.spec | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/golang-github-gorilla-context.spec b/golang-github-gorilla-context.spec
index 6e6718d..271baee 100644
--- a/golang-github-gorilla-context.spec
+++ b/golang-github-gorilla-context.spec
@@ -10,7 +10,7 @@ Summary: A golang registry for global request variables
License: BSD
URL: http://www.gorillatoolkit.org/pkg/context
Source0: https://%{import_path}/archive/%{commit}/context-%{shortcommit}.tar.gz
-BuildArch: noarch
+ExclusiveArch: %{ix86} x86_64 %{arm}
%description
Package gorilla/context stores values shared during a request lifetime.
@@ -51,6 +51,7 @@ cp -pav *.go %{buildroot}%{gopath}/src/%{import_path}
GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}
%files devel
+%defattr(-,root,root,-)
%doc LICENSE README.md
%dir %{gopath}/src/github.com/gorilla
%dir %{gopath}/src/%{import_path}
9 years, 9 months
[golang-github-gorilla-context/el6] handle el6 arch and defattr separately
by Lokesh Mandvekar
commit aaaaac76549eefd19312df125690d3d484eb91c7
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Jul 31 17:52:09 2014 -0500
handle el6 arch and defattr separately
golang-github-gorilla-context.spec | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/golang-github-gorilla-context.spec b/golang-github-gorilla-context.spec
index d16c2be..6e6718d 100644
--- a/golang-github-gorilla-context.spec
+++ b/golang-github-gorilla-context.spec
@@ -5,16 +5,12 @@
Name: golang-github-gorilla-context
Version: 0
-Release: 0.26.git%{shortcommit}%{?dist}
+Release: 0.27.git%{shortcommit}%{?dist}
Summary: A golang registry for global request variables
License: BSD
URL: http://www.gorillatoolkit.org/pkg/context
Source0: https://%{import_path}/archive/%{commit}/context-%{shortcommit}.tar.gz
-%if 0%{?fedora}
BuildArch: noarch
-%else
-ExclusiveArch: %{go_arches}
-%endif
%description
Package gorilla/context stores values shared during a request lifetime.
@@ -55,13 +51,16 @@ cp -pav *.go %{buildroot}%{gopath}/src/%{import_path}
GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}
%files devel
-%defattr(-,root,root,-)
%doc LICENSE README.md
-%dir %attr(755,root,root) %{gopath}/src/github.com/gorilla
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}
+%dir %{gopath}/src/github.com/gorilla
+%dir %{gopath}/src/%{import_path}
%{gopath}/src/%{import_path}/*.go
%changelog
+* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.27.git
+- remove conditionals for arch specification (handle el6 separately)
+- defattr only for el6
+
* Thu Jul 24 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.26.git
- disable debuginfo
9 years, 9 months
[golang-github-gorilla-context/f19] handle el6 arch and defattr separately
by Lokesh Mandvekar
commit 7b9f2af9858bf4f1946ed762e6d7f7ff0e132112
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Jul 31 17:52:09 2014 -0500
handle el6 arch and defattr separately
golang-github-gorilla-context.spec | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/golang-github-gorilla-context.spec b/golang-github-gorilla-context.spec
index d16c2be..6e6718d 100644
--- a/golang-github-gorilla-context.spec
+++ b/golang-github-gorilla-context.spec
@@ -5,16 +5,12 @@
Name: golang-github-gorilla-context
Version: 0
-Release: 0.26.git%{shortcommit}%{?dist}
+Release: 0.27.git%{shortcommit}%{?dist}
Summary: A golang registry for global request variables
License: BSD
URL: http://www.gorillatoolkit.org/pkg/context
Source0: https://%{import_path}/archive/%{commit}/context-%{shortcommit}.tar.gz
-%if 0%{?fedora}
BuildArch: noarch
-%else
-ExclusiveArch: %{go_arches}
-%endif
%description
Package gorilla/context stores values shared during a request lifetime.
@@ -55,13 +51,16 @@ cp -pav *.go %{buildroot}%{gopath}/src/%{import_path}
GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}
%files devel
-%defattr(-,root,root,-)
%doc LICENSE README.md
-%dir %attr(755,root,root) %{gopath}/src/github.com/gorilla
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}
+%dir %{gopath}/src/github.com/gorilla
+%dir %{gopath}/src/%{import_path}
%{gopath}/src/%{import_path}/*.go
%changelog
+* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.27.git
+- remove conditionals for arch specification (handle el6 separately)
+- defattr only for el6
+
* Thu Jul 24 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.26.git
- disable debuginfo
9 years, 9 months
[golang-github-gorilla-context/f20] handle el6 arch and defattr separately
by Lokesh Mandvekar
commit c67479456e8220ac1e9f64e48d1991fa97246e08
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Jul 31 17:52:09 2014 -0500
handle el6 arch and defattr separately
golang-github-gorilla-context.spec | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/golang-github-gorilla-context.spec b/golang-github-gorilla-context.spec
index d16c2be..6e6718d 100644
--- a/golang-github-gorilla-context.spec
+++ b/golang-github-gorilla-context.spec
@@ -5,16 +5,12 @@
Name: golang-github-gorilla-context
Version: 0
-Release: 0.26.git%{shortcommit}%{?dist}
+Release: 0.27.git%{shortcommit}%{?dist}
Summary: A golang registry for global request variables
License: BSD
URL: http://www.gorillatoolkit.org/pkg/context
Source0: https://%{import_path}/archive/%{commit}/context-%{shortcommit}.tar.gz
-%if 0%{?fedora}
BuildArch: noarch
-%else
-ExclusiveArch: %{go_arches}
-%endif
%description
Package gorilla/context stores values shared during a request lifetime.
@@ -55,13 +51,16 @@ cp -pav *.go %{buildroot}%{gopath}/src/%{import_path}
GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}
%files devel
-%defattr(-,root,root,-)
%doc LICENSE README.md
-%dir %attr(755,root,root) %{gopath}/src/github.com/gorilla
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}
+%dir %{gopath}/src/github.com/gorilla
+%dir %{gopath}/src/%{import_path}
%{gopath}/src/%{import_path}/*.go
%changelog
+* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.27.git
+- remove conditionals for arch specification (handle el6 separately)
+- defattr only for el6
+
* Thu Jul 24 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.26.git
- disable debuginfo
9 years, 9 months
[golang-github-gorilla-context/f21] handle el6 arch and defattr separately
by Lokesh Mandvekar
commit 8f80f658d5dabc0507a490f859c5413e04780d08
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Jul 31 17:52:09 2014 -0500
handle el6 arch and defattr separately
golang-github-gorilla-context.spec | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/golang-github-gorilla-context.spec b/golang-github-gorilla-context.spec
index d16c2be..6e6718d 100644
--- a/golang-github-gorilla-context.spec
+++ b/golang-github-gorilla-context.spec
@@ -5,16 +5,12 @@
Name: golang-github-gorilla-context
Version: 0
-Release: 0.26.git%{shortcommit}%{?dist}
+Release: 0.27.git%{shortcommit}%{?dist}
Summary: A golang registry for global request variables
License: BSD
URL: http://www.gorillatoolkit.org/pkg/context
Source0: https://%{import_path}/archive/%{commit}/context-%{shortcommit}.tar.gz
-%if 0%{?fedora}
BuildArch: noarch
-%else
-ExclusiveArch: %{go_arches}
-%endif
%description
Package gorilla/context stores values shared during a request lifetime.
@@ -55,13 +51,16 @@ cp -pav *.go %{buildroot}%{gopath}/src/%{import_path}
GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}
%files devel
-%defattr(-,root,root,-)
%doc LICENSE README.md
-%dir %attr(755,root,root) %{gopath}/src/github.com/gorilla
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}
+%dir %{gopath}/src/github.com/gorilla
+%dir %{gopath}/src/%{import_path}
%{gopath}/src/%{import_path}/*.go
%changelog
+* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.27.git
+- remove conditionals for arch specification (handle el6 separately)
+- defattr only for el6
+
* Thu Jul 24 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.26.git
- disable debuginfo
9 years, 9 months
[golang-github-gorilla-context] handle el6 arch and defattr separately
by Lokesh Mandvekar
commit 2bc8418d71c9c874c861f8fb2d7806c8f557437a
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Jul 31 17:52:09 2014 -0500
handle el6 arch and defattr separately
golang-github-gorilla-context.spec | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/golang-github-gorilla-context.spec b/golang-github-gorilla-context.spec
index d16c2be..6e6718d 100644
--- a/golang-github-gorilla-context.spec
+++ b/golang-github-gorilla-context.spec
@@ -5,16 +5,12 @@
Name: golang-github-gorilla-context
Version: 0
-Release: 0.26.git%{shortcommit}%{?dist}
+Release: 0.27.git%{shortcommit}%{?dist}
Summary: A golang registry for global request variables
License: BSD
URL: http://www.gorillatoolkit.org/pkg/context
Source0: https://%{import_path}/archive/%{commit}/context-%{shortcommit}.tar.gz
-%if 0%{?fedora}
BuildArch: noarch
-%else
-ExclusiveArch: %{go_arches}
-%endif
%description
Package gorilla/context stores values shared during a request lifetime.
@@ -55,13 +51,16 @@ cp -pav *.go %{buildroot}%{gopath}/src/%{import_path}
GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}
%files devel
-%defattr(-,root,root,-)
%doc LICENSE README.md
-%dir %attr(755,root,root) %{gopath}/src/github.com/gorilla
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}
+%dir %{gopath}/src/github.com/gorilla
+%dir %{gopath}/src/%{import_path}
%{gopath}/src/%{import_path}/*.go
%changelog
+* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.27.git
+- remove conditionals for arch specification (handle el6 separately)
+- defattr only for el6
+
* Thu Jul 24 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.26.git
- disable debuginfo
9 years, 9 months
[docker-io/el6] create -devel and -pkg-devel subpackages
by Lokesh Mandvekar
commit e5524b0d093902666514db780378a378b4ba5af4
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Jul 31 16:37:32 2014 -0500
create -devel and -pkg-devel subpackages
docker-io.spec | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 343 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 9d14757..c2ab434 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,7 +10,7 @@
Name: docker-io
Version: 1.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch1: upstream-patched-archive-tar.patch
@@ -67,11 +67,96 @@ and between virtually any server. The same container that a developer builds
and tests on a laptop will run at scale, in production*, on VMs, bare-metal
servers, OpenStack clusters, public instances, or combinations of the above.
+%package devel
+BuildRequires: golang
+Requires: golang
+Requires: docker-io-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}/archive) = %{version}-%{release}
+Provides: golang(%{import_path}/builtins) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib) = %{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/configuration) = %{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}/daemonconfig) = %{version}-%{release}
+Provides: golang(%{import_path}/dockerversion) = %{version}-%{release}
+Provides: golang(%{import_path}/engine) = %{version}-%{release}
+Provides: golang(%{import_path}/graph) = %{version}-%{release}
+Provides: golang(%{import_path}/image) = %{version}-%{release}
+Provides: golang(%{import_path}/integration) = %{version}-%{release}
+Provides: golang(%{import_path}/integration-cli) = %{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}/server) = %{version}-%{release}
+Provides: golang(%{import_path}/sysinit) = %{version}-%{release}
+Provides: golang(%{import_path}/utils) = %{version}-%{release}
+Provides: golang(%{import_path}/utils/broadcastwriter) = %{version}-%{release}
+Provides: golang(%{import_path}/utils/filters) = %{version}-%{release}
+
+%description devel
+This is the source libraries for docker.
+
+%package pkg-devel
+BuildRequires: golang
+Requires: golang
+Summary: A golang registry for global request variables (source libraries)
+Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/iptables) = %{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/proxy) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/signal) = %{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/term) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/testutils) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/units) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/user) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
+
+%description pkg-devel
+This is the source libraries for docker.
+These source librariees are provided by docker, but are independent of docker specific logic.
+The import paths of %{import_path}/pkg/...
+
%prep
%setup -q -n docker-%{version}
rm -rf vendor
%patch1 -p1 -F 2 -b upstream-patched-archive-tar
-%patch2 -p1 -F 2 -b disable-btrfs-and-provide-setns
+%patch2 -p1 -F 2
cp -p %{SOURCE1} contrib/init/sysvinit-redhat/docker.sysconfig
%patch3 -p1 -b finalize-namespace
@@ -129,6 +214,15 @@ install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_s
install -d %{buildroot}%{_initddir}
install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker
+# sources
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}
+
+for dir in api archive builtins daemon daemonconfig dockerversion engine graph \
+ image links nat opts pkg registry runconfig server sysinit utils
+do
+ cp -pav $dir %{buildroot}/%{gopath}/src/%{import_path}/
+done
+
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
exit 0
@@ -187,7 +281,254 @@ fi
%dir %{_datadir}/vim/vimfiles/syntax
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
+%files devel
+%defattr(-,root,root,-)
+%dir %{gopath}/src/%{import_path}
+%dir %{gopath}/src/%{import_path}/api
+%{gopath}/src/%{import_path}/api/MAINTAINERS
+%{gopath}/src/%{import_path}/api/README.md
+%{gopath}/src/%{import_path}/api/*.go
+%{gopath}/src/%{import_path}/api/client/*.go
+%dir %{gopath}/src/%{import_path}/api/server
+%{gopath}/src/%{import_path}/api/server/*.go
+%dir %{gopath}/src/%{import_path}/archive
+%{gopath}/src/%{import_path}/archive/MAINTAINERS
+%{gopath}/src/%{import_path}/archive/README.md
+%{gopath}/src/%{import_path}/archive/*.go
+%{gopath}/src/%{import_path}/archive/*.goupstream-patched-archive-tar
+%dir %{gopath}/src/%{import_path}/archive/testdata
+%{gopath}/src/%{import_path}/archive/testdata/broken.tar
+%dir %{gopath}/src/%{import_path}/builtins
+%{gopath}/src/%{import_path}/builtins/*.go
+%dir %{gopath}/src/%{import_path}/daemon
+%{gopath}/src/%{import_path}/daemon/*.go
+%{gopath}/src/%{import_path}/daemon/README.md
+%dir %{gopath}/src/%{import_path}/daemon/execdriver
+%{gopath}/src/%{import_path}/daemon/execdriver/*.go
+%{gopath}/src/%{import_path}/daemon/execdriver/MAINTAINERS
+%dir %{gopath}/src/%{import_path}/daemon/execdriver/execdrivers
+%{gopath}/src/%{import_path}/daemon/execdriver/execdrivers/*.go
+%dir %{gopath}/src/%{import_path}/daemon/execdriver/lxc
+%{gopath}/src/%{import_path}/daemon/execdriver/lxc/*.go
+%dir %{gopath}/src/%{import_path}/daemon/execdriver/native
+%{gopath}/src/%{import_path}/daemon/execdriver/native/*.go
+%dir %{gopath}/src/%{import_path}/daemon/execdriver/native/configuration
+%{gopath}/src/%{import_path}/daemon/execdriver/native/configuration/*.go
+%dir %{gopath}/src/%{import_path}/daemon/execdriver/native/template
+%{gopath}/src/%{import_path}/daemon/execdriver/native/template/*.go
+%dir %{gopath}/src/%{import_path}/daemon/graphdriver
+%{gopath}/src/%{import_path}/daemon/graphdriver/*.go
+%dir %{gopath}/src/%{import_path}/daemon/graphdriver/aufs
+%{gopath}/src/%{import_path}/daemon/graphdriver/aufs/*.go
+%dir %{gopath}/src/%{import_path}/daemon/graphdriver/btrfs
+%{gopath}/src/%{import_path}/daemon/graphdriver/btrfs/*.go
+%{gopath}/src/%{import_path}/daemon/graphdriver/btrfs/MAINTAINERS
+%dir %{gopath}/src/%{import_path}/daemon/graphdriver/devmapper
+%{gopath}/src/%{import_path}/daemon/graphdriver/devmapper/*.go
+%{gopath}/src/%{import_path}/daemon/graphdriver/devmapper/MAINTAINERS
+%{gopath}/src/%{import_path}/daemon/graphdriver/devmapper/README.md
+%dir %{gopath}/src/%{import_path}/daemon/graphdriver/graphtest
+%{gopath}/src/%{import_path}/daemon/graphdriver/graphtest/*.go
+%dir %{gopath}/src/%{import_path}/daemon/graphdriver/vfs
+%{gopath}/src/%{import_path}/daemon/graphdriver/vfs/*.go
+%dir %{gopath}/src/%{import_path}/daemon/networkdriver
+%dir %{gopath}/src/%{import_path}/daemon/networkdriver/bridge
+%{gopath}/src/%{import_path}/daemon/networkdriver/bridge/*.go
+%dir %{gopath}/src/%{import_path}/daemon/networkdriver/ipallocator
+%{gopath}/src/%{import_path}/daemon/networkdriver/ipallocator/*.go
+%{gopath}/src/%{import_path}/daemon/networkdriver/*.go
+%dir %{gopath}/src/%{import_path}/daemon/networkdriver/portallocator
+%{gopath}/src/%{import_path}/daemon/networkdriver/portallocator/*.go
+%dir %{gopath}/src/%{import_path}/daemon/networkdriver/portmapper
+%{gopath}/src/%{import_path}/daemon/networkdriver/portmapper/*.go
+%dir %{gopath}/src/%{import_path}/daemonconfig
+%{gopath}/src/%{import_path}/daemonconfig/README.md
+%{gopath}/src/%{import_path}/daemonconfig/*.go
+%dir %{gopath}/src/%{import_path}/dockerversion
+%{gopath}/src/%{import_path}/dockerversion/*.go
+%dir %{gopath}/src/%{import_path}/engine
+%{gopath}/src/%{import_path}/engine/MAINTAINERS
+%{gopath}/src/%{import_path}/engine/*.go
+%dir %{gopath}/src/%{import_path}/engine/rengine
+%{gopath}/src/%{import_path}/engine/rengine/*.go
+%dir %{gopath}/src/%{import_path}/engine/spawn
+%{gopath}/src/%{import_path}/engine/spawn/*.go
+%dir %{gopath}/src/%{import_path}/engine/spawn/subengine
+%{gopath}/src/%{import_path}/engine/spawn/subengine/*.go
+%dir %{gopath}/src/%{import_path}/graph
+%{gopath}/src/%{import_path}/graph/*.go
+%{gopath}/src/%{import_path}/graph/*.goupstream-patched-archive-tar
+%dir %{gopath}/src/%{import_path}/image
+%{gopath}/src/%{import_path}/image/*.go
+%dir %{gopath}/src/%{import_path}/links
+%{gopath}/src/%{import_path}/links/*.go
+%dir %{gopath}/src/%{import_path}/nat
+%{gopath}/src/%{import_path}/nat/*.go
+%dir %{gopath}/src/%{import_path}/opts
+%{gopath}/src/%{import_path}/opts/*.go
+%dir %{gopath}/src/%{import_path}/registry
+%{gopath}/src/%{import_path}/registry/MAINTAINERS
+%{gopath}/src/%{import_path}/registry/*.go
+%dir %{gopath}/src/%{import_path}/runconfig
+%{gopath}/src/%{import_path}/runconfig/*.go
+%dir %{gopath}/src/%{import_path}/server
+%{gopath}/src/%{import_path}/server/MAINTAINERS
+%{gopath}/src/%{import_path}/server/*.go
+%dir %{gopath}/src/%{import_path}/sysinit
+%{gopath}/src/%{import_path}/sysinit/README.md
+%{gopath}/src/%{import_path}/sysinit/*.go
+%dir %{gopath}/src/%{import_path}/utils
+%dir %{gopath}/src/%{import_path}/utils/filters
+%{gopath}/src/%{import_path}/utils/filters/*.go
+%{gopath}/src/%{import_path}/utils/*.goupstream-patched-archive-tar
+%{gopath}/src/%{import_path}/utils/*.go
+%dir %{gopath}/src/%{import_path}/utils/testdata
+%dir %{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457
+%{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json
+%{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar
+%dir %{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158
+%{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json
+%{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar
+
+%files pkg-devel
+%defattr(-,root,root,-)
+%dir %{gopath}/src/%{import_path}
+%dir %{gopath}/src/%{import_path}/pkg
+%{gopath}/src/%{import_path}/pkg/README.md
+%dir %{gopath}/src/%{import_path}/pkg/apparmor
+%{gopath}/src/%{import_path}/pkg/apparmor/*.go
+%dir %{gopath}/src/%{import_path}/pkg/beam
+%{gopath}/src/%{import_path}/pkg/beam/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/beam/*.go
+%dir %{gopath}/src/%{import_path}/pkg/beam/data
+%{gopath}/src/%{import_path}/pkg/beam/data/*.go
+%{gopath}/src/%{import_path}/pkg/beam/data/netstring.txt
+%dir %{gopath}/src/%{import_path}/pkg/beam/examples
+%dir %{gopath}/src/%{import_path}/pkg/beam/examples/beamsh
+%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/beamsh
+%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/*.go
+%dir %{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/scripts
+%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/scripts/*.ds
+%dir %{gopath}/src/%{import_path}/pkg/dockerscript
+%{gopath}/src/%{import_path}/pkg/dockerscript/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/dockerscript/*.go
+%dir %{gopath}/src/%{import_path}/pkg/dockerscript/scanner
+%{gopath}/src/%{import_path}/pkg/dockerscript/scanner/*.go
+%dir %{gopath}/src/%{import_path}/pkg/graphdb
+%{gopath}/src/%{import_path}/pkg/graphdb/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/graphdb/*.go
+%dir %{gopath}/src/%{import_path}/pkg/iptables
+%{gopath}/src/%{import_path}/pkg/iptables/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/iptables/*.go
+%dir %{gopath}/src/%{import_path}/pkg/label
+%{gopath}/src/%{import_path}/pkg/label/*.go
+%dir %{gopath}/src/%{import_path}/pkg/listenbuffer
+%{gopath}/src/%{import_path}/pkg/listenbuffer/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer
+%{gopath}/src/%{import_path}/pkg/libcontainer/*.go
+%{gopath}/src/%{import_path}/pkg/libcontainer/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/libcontainer/README.md
+%{gopath}/src/%{import_path}/pkg/libcontainer/TODO.md
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups
+%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/fs
+%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/fs/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/systemd
+%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/systemd/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/console
+%{gopath}/src/%{import_path}/pkg/libcontainer/console/*.go
+%{gopath}/src/%{import_path}/pkg/libcontainer/container.json
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/devices
+%{gopath}/src/%{import_path}/pkg/libcontainer/devices/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/mount
+%{gopath}/src/%{import_path}/pkg/libcontainer/mount/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/mount/nodes
+%{gopath}/src/%{import_path}/pkg/libcontainer/mount/nodes/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/namespaces
+%{gopath}/src/%{import_path}/pkg/libcontainer/namespaces/*.go
+%{gopath}/src/%{import_path}/pkg/libcontainer/namespaces/init.gofinalize-namespace
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/network
+%{gopath}/src/%{import_path}/pkg/libcontainer/network/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/nsinit
+%{gopath}/src/%{import_path}/pkg/libcontainer/nsinit/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security/capabilities
+%{gopath}/src/%{import_path}/pkg/libcontainer/security/capabilities/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security/restrict
+%{gopath}/src/%{import_path}/pkg/libcontainer/security/restrict/*.go
+%dir %{gopath}/src/%{import_path}/pkg/libcontainer/utils
+%{gopath}/src/%{import_path}/pkg/libcontainer/utils/*.go
+%dir %{gopath}/src/%{import_path}/pkg/mflag
+%{gopath}/src/%{import_path}/pkg/mflag/LICENSE
+%{gopath}/src/%{import_path}/pkg/mflag/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/mflag/README.md
+%dir %{gopath}/src/%{import_path}/pkg/mflag/example
+%{gopath}/src/%{import_path}/pkg/mflag/example/example.go
+%{gopath}/src/%{import_path}/pkg/mflag/*.go
+%dir %{gopath}/src/%{import_path}/pkg/mount
+%{gopath}/src/%{import_path}/pkg/mount/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/mount/*.go
+%dir %{gopath}/src/%{import_path}/pkg/namesgenerator
+%{gopath}/src/%{import_path}/pkg/namesgenerator/*.go
+%dir %{gopath}/src/%{import_path}/pkg/netlink
+%{gopath}/src/%{import_path}/pkg/netlink/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/netlink/*.go
+%dir %{gopath}/src/%{import_path}/pkg/networkfs
+%{gopath}/src/%{import_path}/pkg/networkfs/MAINTAINERS
+%dir %{gopath}/src/%{import_path}/pkg/networkfs/etchosts
+%{gopath}/src/%{import_path}/pkg/networkfs/etchosts/*.go
+%dir %{gopath}/src/%{import_path}/pkg/networkfs/resolvconf
+%{gopath}/src/%{import_path}/pkg/networkfs/resolvconf/*.go
+%dir %{gopath}/src/%{import_path}/pkg/proxy
+%{gopath}/src/%{import_path}/pkg/proxy/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/proxy/*.go
+%dir %{gopath}/src/%{import_path}/pkg/selinux
+%{gopath}/src/%{import_path}/pkg/selinux/*.go
+%dir %{gopath}/src/%{import_path}/pkg/signal
+%{gopath}/src/%{import_path}/pkg/signal/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/signal/*.go
+%dir %{gopath}/src/%{import_path}/pkg/symlink
+%{gopath}/src/%{import_path}/pkg/symlink/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/symlink/*.go
+%dir %{gopath}/src/%{import_path}/pkg/symlink/testdata
+%dir %{gopath}/src/%{import_path}/pkg/symlink/testdata/fs
+%dir %{gopath}/src/%{import_path}/pkg/symlink/testdata/fs/a
+%{gopath}/src/%{import_path}/pkg/symlink/testdata/fs/a/d
+%{gopath}/src/%{import_path}/pkg/symlink/testdata/fs/a/e
+%{gopath}/src/%{import_path}/pkg/symlink/testdata/fs/a/f
+%dir %{gopath}/src/%{import_path}/pkg/symlink/testdata/fs/b
+%{gopath}/src/%{import_path}/pkg/symlink/testdata/fs/b/h
+%{gopath}/src/%{import_path}/pkg/symlink/testdata/fs/g
+%{gopath}/src/%{import_path}/pkg/symlink/testdata/fs/i
+%dir %{gopath}/src/%{import_path}/pkg/sysinfo
+%{gopath}/src/%{import_path}/pkg/sysinfo/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/sysinfo/*.go
+%dir %{gopath}/src/%{import_path}/pkg/system
+%{gopath}/src/%{import_path}/pkg/system/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/system/*.go
+%dir %{gopath}/src/%{import_path}/pkg/systemd
+%{gopath}/src/%{import_path}/pkg/systemd/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/systemd/*.go
+%dir %{gopath}/src/%{import_path}/pkg/term
+%{gopath}/src/%{import_path}/pkg/term/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/term/*.go
+%dir %{gopath}/src/%{import_path}/pkg/testutils
+%{gopath}/src/%{import_path}/pkg/testutils/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/testutils/README.md
+%{gopath}/src/%{import_path}/pkg/testutils/testutils.go
+%dir %{gopath}/src/%{import_path}/pkg/units
+%{gopath}/src/%{import_path}/pkg/units/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/units/*.go
+%dir %{gopath}/src/%{import_path}/pkg/user
+%{gopath}/src/%{import_path}/pkg/user/MAINTAINERS
+%{gopath}/src/%{import_path}/pkg/user/*.go
+%dir %{gopath}/src/%{import_path}/pkg/version
+%{gopath}/src/%{import_path}/pkg/version/*.go
+
%changelog
+* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.0.0-7
+- create -devel and -pkg-devel subpackages
+
* Thu Jun 19 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 1.0.0-6
- Clean up after ourselves from previous releases. We caused a failure in
yum update transactions by removing chkconfig entries.
9 years, 9 months
[docker-io/f19] split out the ./pkg/ libraries
by Lokesh Mandvekar
commit 3eb3ee9cac0c1c46b39669183f5a02251f49f579
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Mon Jul 28 11:07:35 2014 -0400
split out the ./pkg/ libraries
since they are indepenent of docker functionality, and used by outside
tools as well.
docker-io.spec | 85 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 51 insertions(+), 34 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 1db8443..241982f 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -11,7 +11,7 @@
Name: docker-io
Version: 1.0.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch1: upstream-patched-archive-tar.patch
@@ -76,7 +76,8 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%package devel
BuildRequires: golang
Requires: golang
-Summary: A golang registry for global request variables
+Requires: docker-io-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}
@@ -114,6 +115,21 @@ Provides: golang(%{import_path}/integration-cli) = %{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}/server) = %{version}-%{release}
+Provides: golang(%{import_path}/sysinit) = %{version}-%{release}
+Provides: golang(%{import_path}/utils) = %{version}-%{release}
+Provides: golang(%{import_path}/utils/broadcastwriter) = %{version}-%{release}
+Provides: golang(%{import_path}/utils/filters) = %{version}-%{release}
+
+%description devel
+This is the source libraries for docker.
+
+%package pkg-devel
+BuildRequires: golang
+Requires: golang
+Summary: A golang registry for global request variables (source libraries)
Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release}
@@ -136,17 +152,11 @@ Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/units) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/user) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
-Provides: golang(%{import_path}/registry) = %{version}-%{release}
-Provides: golang(%{import_path}/runconfig) = %{version}-%{release}
-Provides: golang(%{import_path}/server) = %{version}-%{release}
-Provides: golang(%{import_path}/sysinit) = %{version}-%{release}
-Provides: golang(%{import_path}/utils) = %{version}-%{release}
-Provides: golang(%{import_path}/utils/broadcastwriter) = %{version}-%{release}
-Provides: golang(%{import_path}/utils/filters) = %{version}-%{release}
-
-%description devel
+%description pkg-devel
This is the source libraries for docker.
+These source librariees are provided by docker, but are independent of docker specific logic.
+The import paths of %{import_path}/pkg/...
%prep
%setup -q -n docker-%{version}
@@ -339,6 +349,33 @@ exit 0
%{gopath}/src/%{import_path}/nat/*.go
%dir %{gopath}/src/%{import_path}/opts
%{gopath}/src/%{import_path}/opts/*.go
+%dir %{gopath}/src/%{import_path}/registry
+%{gopath}/src/%{import_path}/registry/MAINTAINERS
+%{gopath}/src/%{import_path}/registry/*.go
+%dir %{gopath}/src/%{import_path}/runconfig
+%{gopath}/src/%{import_path}/runconfig/*.go
+%dir %{gopath}/src/%{import_path}/server
+%{gopath}/src/%{import_path}/server/MAINTAINERS
+%{gopath}/src/%{import_path}/server/*.go
+%dir %{gopath}/src/%{import_path}/sysinit
+%{gopath}/src/%{import_path}/sysinit/README.md
+%{gopath}/src/%{import_path}/sysinit/*.go
+%dir %{gopath}/src/%{import_path}/utils
+%dir %{gopath}/src/%{import_path}/utils/filters
+%{gopath}/src/%{import_path}/utils/filters/*.go
+%{gopath}/src/%{import_path}/utils/*.goupstream-patched-archive-tar
+%{gopath}/src/%{import_path}/utils/*.go
+%dir %{gopath}/src/%{import_path}/utils/testdata
+%dir %{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457
+%{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json
+%{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar
+%dir %{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158
+%{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json
+%{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar
+
+%files pkg-devel
+%defattr(-,root,root,-)
+%dir %{gopath}/src/%{import_path}
%dir %{gopath}/src/%{import_path}/pkg
%{gopath}/src/%{import_path}/pkg/README.md
%dir %{gopath}/src/%{import_path}/pkg/apparmor
@@ -470,31 +507,11 @@ exit 0
%{gopath}/src/%{import_path}/pkg/user/*.go
%dir %{gopath}/src/%{import_path}/pkg/version
%{gopath}/src/%{import_path}/pkg/version/*.go
-%dir %{gopath}/src/%{import_path}/registry
-%{gopath}/src/%{import_path}/registry/MAINTAINERS
-%{gopath}/src/%{import_path}/registry/*.go
-%dir %{gopath}/src/%{import_path}/runconfig
-%{gopath}/src/%{import_path}/runconfig/*.go
-%dir %{gopath}/src/%{import_path}/server
-%{gopath}/src/%{import_path}/server/MAINTAINERS
-%{gopath}/src/%{import_path}/server/*.go
-%dir %{gopath}/src/%{import_path}/sysinit
-%{gopath}/src/%{import_path}/sysinit/README.md
-%{gopath}/src/%{import_path}/sysinit/*.go
-%dir %{gopath}/src/%{import_path}/utils
-%dir %{gopath}/src/%{import_path}/utils/filters
-%{gopath}/src/%{import_path}/utils/filters/*.go
-%{gopath}/src/%{import_path}/utils/*.goupstream-patched-archive-tar
-%{gopath}/src/%{import_path}/utils/*.go
-%dir %{gopath}/src/%{import_path}/utils/testdata
-%dir %{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457
-%{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json
-%{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar
-%dir %{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158
-%{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json
-%{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar
%changelog
+* Mon Jul 28 2014 Vincent Batts <vbatts(a)fedoraproject.org> - 1.0.0-10
+- split out the %{import_path}/pkg/... libraries, to avoid cyclic deps with libcontainer
+
* Thu Jul 24 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.0.0-9
- /etc/sysconfig/docker should be config(noreplace)
9 years, 9 months
[docker-io/f20] split out the ./pkg/ libraries
by Lokesh Mandvekar
commit 27ea6536045a23435f23d229787d9f5ad23399d8
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Mon Jul 28 11:07:35 2014 -0400
split out the ./pkg/ libraries
since they are indepenent of docker functionality, and used by outside
tools as well.
docker-io.spec | 85 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 51 insertions(+), 34 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index fdc0d69..f37e502 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -11,7 +11,7 @@
Name: docker-io
Version: 1.0.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch1: upstream-patched-archive-tar.patch
@@ -76,7 +76,8 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%package devel
BuildRequires: golang
Requires: golang
-Summary: A golang registry for global request variables
+Requires: docker-io-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}
@@ -114,6 +115,21 @@ Provides: golang(%{import_path}/integration-cli) = %{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}/server) = %{version}-%{release}
+Provides: golang(%{import_path}/sysinit) = %{version}-%{release}
+Provides: golang(%{import_path}/utils) = %{version}-%{release}
+Provides: golang(%{import_path}/utils/broadcastwriter) = %{version}-%{release}
+Provides: golang(%{import_path}/utils/filters) = %{version}-%{release}
+
+%description devel
+This is the source libraries for docker.
+
+%package pkg-devel
+BuildRequires: golang
+Requires: golang
+Summary: A golang registry for global request variables (source libraries)
Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release}
@@ -136,17 +152,11 @@ Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/units) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/user) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
-Provides: golang(%{import_path}/registry) = %{version}-%{release}
-Provides: golang(%{import_path}/runconfig) = %{version}-%{release}
-Provides: golang(%{import_path}/server) = %{version}-%{release}
-Provides: golang(%{import_path}/sysinit) = %{version}-%{release}
-Provides: golang(%{import_path}/utils) = %{version}-%{release}
-Provides: golang(%{import_path}/utils/broadcastwriter) = %{version}-%{release}
-Provides: golang(%{import_path}/utils/filters) = %{version}-%{release}
-
-%description devel
+%description pkg-devel
This is the source libraries for docker.
+These source librariees are provided by docker, but are independent of docker specific logic.
+The import paths of %{import_path}/pkg/...
%prep
%setup -q -n docker-%{version}
@@ -339,6 +349,33 @@ exit 0
%{gopath}/src/%{import_path}/nat/*.go
%dir %{gopath}/src/%{import_path}/opts
%{gopath}/src/%{import_path}/opts/*.go
+%dir %{gopath}/src/%{import_path}/registry
+%{gopath}/src/%{import_path}/registry/MAINTAINERS
+%{gopath}/src/%{import_path}/registry/*.go
+%dir %{gopath}/src/%{import_path}/runconfig
+%{gopath}/src/%{import_path}/runconfig/*.go
+%dir %{gopath}/src/%{import_path}/server
+%{gopath}/src/%{import_path}/server/MAINTAINERS
+%{gopath}/src/%{import_path}/server/*.go
+%dir %{gopath}/src/%{import_path}/sysinit
+%{gopath}/src/%{import_path}/sysinit/README.md
+%{gopath}/src/%{import_path}/sysinit/*.go
+%dir %{gopath}/src/%{import_path}/utils
+%dir %{gopath}/src/%{import_path}/utils/filters
+%{gopath}/src/%{import_path}/utils/filters/*.go
+%{gopath}/src/%{import_path}/utils/*.goupstream-patched-archive-tar
+%{gopath}/src/%{import_path}/utils/*.go
+%dir %{gopath}/src/%{import_path}/utils/testdata
+%dir %{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457
+%{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json
+%{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar
+%dir %{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158
+%{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json
+%{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar
+
+%files pkg-devel
+%defattr(-,root,root,-)
+%dir %{gopath}/src/%{import_path}
%dir %{gopath}/src/%{import_path}/pkg
%{gopath}/src/%{import_path}/pkg/README.md
%dir %{gopath}/src/%{import_path}/pkg/apparmor
@@ -470,31 +507,11 @@ exit 0
%{gopath}/src/%{import_path}/pkg/user/*.go
%dir %{gopath}/src/%{import_path}/pkg/version
%{gopath}/src/%{import_path}/pkg/version/*.go
-%dir %{gopath}/src/%{import_path}/registry
-%{gopath}/src/%{import_path}/registry/MAINTAINERS
-%{gopath}/src/%{import_path}/registry/*.go
-%dir %{gopath}/src/%{import_path}/runconfig
-%{gopath}/src/%{import_path}/runconfig/*.go
-%dir %{gopath}/src/%{import_path}/server
-%{gopath}/src/%{import_path}/server/MAINTAINERS
-%{gopath}/src/%{import_path}/server/*.go
-%dir %{gopath}/src/%{import_path}/sysinit
-%{gopath}/src/%{import_path}/sysinit/README.md
-%{gopath}/src/%{import_path}/sysinit/*.go
-%dir %{gopath}/src/%{import_path}/utils
-%dir %{gopath}/src/%{import_path}/utils/filters
-%{gopath}/src/%{import_path}/utils/filters/*.go
-%{gopath}/src/%{import_path}/utils/*.goupstream-patched-archive-tar
-%{gopath}/src/%{import_path}/utils/*.go
-%dir %{gopath}/src/%{import_path}/utils/testdata
-%dir %{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457
-%{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json
-%{gopath}/src/%{import_path}/utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar
-%dir %{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158
-%{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json
-%{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar
%changelog
+* Mon Jul 28 2014 Vincent Batts <vbatts(a)fedoraproject.org> - 1.0.0-10
+- split out the %{import_path}/pkg/... libraries, to avoid cyclic deps with libcontainer
+
* Thu Jul 24 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.0.0-9
- /etc/sysconfig/docker should be config(noreplace)
9 years, 9 months