[golang-github-docker-libcontainer/el6] bump to v1.2.0

[Lokesh Mandvekar]

commit 262d548896577fe39278022fa07ac7de67b9acff
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date:   Fri Oct 24 10:48:27 2014 -0700

    bump to v1.2.0
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at fedoraproject.org>

 .gitignore                             |    1 +
 golang-github-docker-libcontainer.spec |   82 ++++++++++---------------------
 sources                                |    2 +-
 3 files changed, 29 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d6e55b..df979e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /v1.1.0.tar.gz
 /libcontainer-29363e2.tar.gz
 /libcontainer-db65c35.tar.gz
+/libcontainer-c907e40.tar.gz
diff --git a/golang-github-docker-libcontainer.spec b/golang-github-docker-libcontainer.spec
index 953ba97..dbfd243 100644
--- a/golang-github-docker-libcontainer.spec
+++ b/golang-github-docker-libcontainer.spec
@@ -1,11 +1,11 @@
 %global debug_package   %{nil}
 %global import_path     github.com/docker/libcontainer
-%global commit          db65c35051d05f3fb218a0e84a11267e0894fe0a
+%global commit          c907e406fe81320d87b58edf74953ceb08facc13
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-github-docker-libcontainer
-Version:        1.1.0
-Release:        10.git%{shortcommit}%{?dist}
+Version:        1.2.0
+Release:        1.git%{shortcommit}%{?dist}
 Summary:        Configuration options for containers
 License:        ASL 2.0
 URL:            https://%{import_path}
@@ -44,6 +44,7 @@ Provides:       golang(%{import_path}/label) = %{version}-%{release}
 Provides:       golang(%{import_path}/mount) = %{version}-%{release}
 Provides:       golang(%{import_path}/mount/nodes) = %{version}-%{release}
 Provides:       golang(%{import_path}/namespaces) = %{version}-%{release}
+Provides:       golang(%{import_path}/namespaces/nsenter) = %{version}-%{release}
 Provides:       golang(%{import_path}/netlink) = %{version}-%{release}
 Provides:       golang(%{import_path}/network) = %{version}-%{release}
 Provides:       golang(%{import_path}/nsinit) = %{version}-%{release}
@@ -66,6 +67,7 @@ which use libcontainer.
 
 %prep
 %setup -n libcontainer-%{commit}
+rm -rf vendor
 
 %build
 mkdir -p ./_build/src/github.com/docker
@@ -77,18 +79,18 @@ go build %{import_path}/nsinit
 popd
 
 %install
-for dir in . apparmor cgroups cgroups/fs cgroups/systemd \
-            console devices label mount mount/nodes namespaces \
-            netlink network nsinit security/capabilities \
-            security/restrict selinux syncpipe system user utils; do
-    install -d -p %{buildroot}%{gopath}/src/%{import_path}/$dir
-    cp -pav $dir/*.go %{buildroot}%{gopath}/src/%{import_path}/$dir
-done
-
 # Install nsinit
 install -d %{buildroot}%{_bindir}
 install -p -m 755 ./_build/src/nsinit %{buildroot}%{_bindir}/nsinit
 
+rm -rf _build sample_configs
+install -dp %{buildroot}%{gopath}/src/%{import_path}
+cp -rpav ./*.go %{buildroot}%{gopath}/src/%{import_path}
+
+for dir in */ ; do
+    cp -rpav $dir %{buildroot}%{gopath}/src/%{import_path}
+done
+
 %check
 
 %files
@@ -97,54 +99,24 @@ install -p -m 755 ./_build/src/nsinit %{buildroot}%{_bindir}/nsinit
 %{_bindir}/nsinit
 
 %files devel
-%defattr(-,root,root,-)
-%doc LICENSE README.md
+%doc LICENSE MAINTAINERS MAINTAINERS_GUIDE.md NOTICE
+%doc PRINCIPLES.md README.md ROADMAP.md
 %dir %{gopath}/src/github.com/docker
-%dir %{gopath}/src/%{import_path}
-%dir %{gopath}/src/%{import_path}/apparmor
-%dir %{gopath}/src/%{import_path}/cgroups
-%dir %{gopath}/src/%{import_path}/cgroups/fs
-%dir %{gopath}/src/%{import_path}/cgroups/systemd
-%dir %{gopath}/src/%{import_path}/console
-%dir %{gopath}/src/%{import_path}/devices
-%dir %{gopath}/src/%{import_path}/label
-%dir %{gopath}/src/%{import_path}/mount
-%dir %{gopath}/src/%{import_path}/mount/nodes
-%dir %{gopath}/src/%{import_path}/namespaces
-%dir %{gopath}/src/%{import_path}/netlink
-%dir %{gopath}/src/%{import_path}/network
-%dir %{gopath}/src/%{import_path}/nsinit
-%dir %{gopath}/src/%{import_path}/security
-%dir %{gopath}/src/%{import_path}/security/capabilities
-%dir %{gopath}/src/%{import_path}/security/restrict
-%dir %{gopath}/src/%{import_path}/selinux
-%dir %{gopath}/src/%{import_path}/syncpipe
-%dir %{gopath}/src/%{import_path}/system
-%dir %{gopath}/src/%{import_path}/user
-%dir %{gopath}/src/%{import_path}/utils
+%dir %{gopath}/src/%{import_path}/
+%dir %{gopath}/src/%{import_path}/*
+%dir %{gopath}/src/%{import_path}/*/*
 %{gopath}/src/%{import_path}/*.go
-%{gopath}/src/%{import_path}/apparmor/*.go
-%{gopath}/src/%{import_path}/cgroups/*.go
-%{gopath}/src/%{import_path}/cgroups/fs/*.go
-%{gopath}/src/%{import_path}/cgroups/systemd/*.go
-%{gopath}/src/%{import_path}/console/*.go
-%{gopath}/src/%{import_path}/devices/*.go
-%{gopath}/src/%{import_path}/label/*.go
-%{gopath}/src/%{import_path}/mount/*.go
-%{gopath}/src/%{import_path}/mount/nodes/*.go
-%{gopath}/src/%{import_path}/namespaces/*.go
-%{gopath}/src/%{import_path}/netlink/*.go
-%{gopath}/src/%{import_path}/network/*.go
-%{gopath}/src/%{import_path}/nsinit/*.go
-%{gopath}/src/%{import_path}/security/capabilities/*.go
-%{gopath}/src/%{import_path}/security/restrict/*.go
-%{gopath}/src/%{import_path}/selinux/*.go
-%{gopath}/src/%{import_path}/syncpipe/*.go
-%{gopath}/src/%{import_path}/system/*.go
-%{gopath}/src/%{import_path}/user/*.go
-%{gopath}/src/%{import_path}/utils/*.go
+%{gopath}/src/%{import_path}/*/*.go
+%{gopath}/src/%{import_path}/*/MAINTAINERS
+%{gopath}/src/%{import_path}/*/*/*.go
+%{gopath}/src/%{import_path}/*/*/README.md
+%{gopath}/src/%{import_path}/*/*/*.json
+%{gopath}/src/%{import_path}/*/*/*.c
 
 %changelog
+* Fri Oct 24 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.2.0-1.gitc907e40
+- bump to v1.2.0 commit c907e406fe81320d87b58edf74953ceb08facc13
+
 * Sat Aug 23 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.1.0-10.git
 - Include syncpipe, system and user dirs missed in previous build
 
diff --git a/sources b/sources
index b93edc1..10dbc68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42bc7f1335c040f94e5bf9fbfdba0b68  libcontainer-db65c35.tar.gz
+611dd9e88add587a51f3d7081f525632  libcontainer-c907e40.tar.gz