[golang] nach ein mahl
by Vincent Batts
commit e46d680a80f3e63a6b258d07dbf02ce92fe8586c
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Tue May 13 13:01:30 2014 -0400
nach ein mahl
golang.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index f12a37a..dde9e73 100644
--- a/golang.spec
+++ b/golang.spec
@@ -640,6 +640,8 @@ fi
# this is wacky that now these files are generated in a different arch
%exclude %{goroot}/src/cmd/8l/enam.c
%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go
+%exclude %{goroot}/src/cmd/6l/enam.c
+%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
%exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_386.c
10 years
[docker-io/f19] enable selinux, remove conditionals
by Lokesh Mandvekar
commit 4bf6f207adfd7904bcc45a8ed6ea03c4b267b114
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue May 13 10:11:23 2014 -0400
enable selinux, remove conditionals
docker-0.9-el6-lxc.patch | 13 ---
docker-io.spec | 74 ++------------
docker.service | 13 +++
ignore-btrfs-for-rhel.patch | 233 -------------------------------------------
4 files changed, 25 insertions(+), 308 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 17ffffd..b61f455 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -1,7 +1,3 @@
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%bcond_without systemd
-%endif
-
# modifying the dockerinit binary breaks the SHA1 sum check by docker
%global __os_install_post %{_rpmconfigdir}/brp-compress
@@ -14,18 +10,16 @@
Name: docker-io
Version: 0.11.1
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
-Patch0: ignore-btrfs-for-rhel.patch
Patch1: upstream-patched-archive-tar.patch
-
-Patch90: docker-0.9-el6-lxc.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
+Source1: docker.service
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
BuildRequires: gcc
@@ -44,39 +38,19 @@ BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
BuildRequires: device-mapper-devel
-# btrfs not available for rhel yet
-%if 0%{?fedora}
BuildRequires: btrfs-progs-devel
-%endif
-%if %{with systemd}
BuildRequires: pkgconfig(systemd)
# Build upstream docs with pandoc
BuildRequires: pandoc
Requires: systemd-units
-%else
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(postun): initscripts
-%endif
# need xz to work with ubuntu images
# https://bugzilla.redhat.com/show_bug.cgi?id=1045220
Requires: xz
-# https://bugzilla.redhat.com/show_bug.cgi?id=1035436
-# this won't be needed for rhel7+
-%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
-Requires: bridge-utils
-Requires: lxc
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1034919
-# No longer needed in Fedora because of libcontainer
-Requires: libcgroup
-%endif
-
Provides: lxc-docker = %{version}
%description
@@ -92,10 +66,6 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-%if 0%{?rhel}
-%patch0 -p1 -b ignore-btrfs-for-rhel
-%patch90 -p1 -b docker-0.9-el6-lxc
-%endif
%patch1 -p1 -b upstream-patched-archive-tar
%build
@@ -107,6 +77,7 @@ pushd _build
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
+export DOCKER_BUILDTAGS='selinux'
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
@@ -140,45 +111,23 @@ install -d %{buildroot}%{_sysconfdir}/udev/rules.d
install -p -m 755 contrib/udev/80-docker.rules %{buildroot}%{_sysconfdir}/udev/rules.d
# install storage dir
install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
-# install systemd/init scripts
-%if %{with systemd}
+# install systemd unitfile
install -d %{buildroot}%{_unitdir}
-install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
-%else
-install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/docker
-install -d %{buildroot}%{_initddir}
-install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker
-%endif
+#install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
exit 0
%post
-%if %{with systemd}
%systemd_post docker
-%else
-# install but don't activate
-/sbin/chkconfig --add docker
-%endif
%preun
-%if %{with systemd}
%systemd_preun docker
-%else
-/sbin/service docker stop >/dev/null 2>&1
-/sbin/chkconfig --del docker
-%endif
%postun
-%if %{with systemd}
%systemd_postun_with_restart docker
-%else
-if [ "$1" -ge "1" ] ; then
- /sbin/service docker condrestart >/dev/null 2>&1 || :
-fi
-%endif
%files
%defattr(-,root,root,-)
@@ -188,12 +137,7 @@ fi
%{_bindir}/docker
%dir %{_libexecdir}/docker
%{_libexecdir}/docker/dockerinit
-%if %{with systemd}
%{_unitdir}/docker.service
-%else
-%config(noreplace) %{_sysconfdir}/sysconfig/docker
-%{_initddir}/docker
-%endif
%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/bash_completion.d/docker.bash
%{_datadir}/zsh/site-functions/_docker
@@ -208,6 +152,12 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Tue May 13 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-3
+- enable selinux
+
+* Tue May 13 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-2
+- remove conditionals
+
* Thu May 08 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-1
- Bug 1095616 - upstream bump to 0.11.1
- manpages via pandoc
diff --git a/docker.service b/docker.service
new file mode 100644
index 0000000..1a63071
--- /dev/null
+++ b/docker.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.io
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/docker -d --selinux-enabled
+Restart=on-failure
+LimitNOFILE=1048576
+LimitNPROC=1048576
+
+[Install]
+WantedBy=multi-user.target
10 years
[golang] more rearranging
by Vincent Batts
commit 28979baa990379368059d97722dd1134cf2cccfb
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Mon May 12 15:00:01 2014 -0400
more rearranging
golang.spec | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 22736e1..f12a37a 100644
--- a/golang.spec
+++ b/golang.spec
@@ -638,10 +638,8 @@ fi
%ifarch %{ix86}
# this is wacky that now these files are generated in a different arch
-#%exclude %{goroot}/src/cmd/8l/enam.c
-#%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go
-%exclude %{goroot}/src/cmd/6l/enam.c
-%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
+%exclude %{goroot}/src/cmd/8l/enam.c
+%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go
%exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_386.c
@@ -657,6 +655,9 @@ fi
%endif
%ifarch x86_64
+%exclude %{goroot}/src/cmd/6l/enam.c
+%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
+
%exclude %{goroot}/src/pkg/runtime/zasm_linux_amd64.h
%exclude %{goroot}/src/pkg/runtime/zmprof_linux_amd64.c
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_amd64.c
@@ -672,8 +673,9 @@ fi
%ifarch %{arm}
%exclude %{goroot}/src/cmd/5l/enam.c
-%exclude %{goroot}/src/pkg/runtime/zasm_linux_arm.h
%exclude %{goroot}/src/pkg/runtime/zgoarch_arm.go
+
+%exclude %{goroot}/src/pkg/runtime/zasm_linux_arm.h
%exclude %{goroot}/src/pkg/runtime/znetpoll_linux_arm.c
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_arm.c
%exclude %{goroot}/src/pkg/runtime/zmprof_linux_arm.c
10 years
[docker-io/epel7] v0.11.3
by Lokesh Mandvekar
commit 872cb867a5ac7a01d3e6010dd66f81deedb8230d
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Mon May 12 11:32:03 2014 -0400
v0.11.3
docker-0.9-el6-lxc.patch | 13 -----
docker-io.spec | 81 ++++++++-------------------------
docker.service | 13 +++++
ignore-btrfs-for-rhel.patch | 47 +++++++++++---------
sources | 2 +-
upstream-patched-archive-tar.patch | 87 ++++++++++++++++--------------------
6 files changed, 98 insertions(+), 145 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index cd576f9..72a8b0f 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -1,7 +1,3 @@
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%bcond_without systemd
-%endif
-
# modifying the dockerinit binary breaks the SHA1 sum check by docker
%global __os_install_post %{_rpmconfigdir}/brp-compress
@@ -9,25 +5,23 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit dc9c28f51d669d6b09e81c2381f800f1a33bb659
+%global commit fb99f992c081a1d433c97c99ffb46d12693eeb76
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.10.0
-Release: 2%{?dist}
+Version: 0.11.1
+Release: 3%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch
Patch1: upstream-patched-archive-tar.patch
-Patch90: docker-0.9-el6-lxc.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
-# though final name for sysconf/sysvinit files is simply 'docker',
-# having .sysvinit and .sysconfig makes things clear
+Source1: docker.service
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2-7 and above
@@ -42,30 +36,16 @@ BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
BuildRequires: device-mapper-devel
# btrfs not available for rhel yet
-%if 0%{?fedora}
-BuildRequires: btrfs-progs-devel
-%endif
-%if %{with systemd}
+#BuildRequires: btrfs-progs-devel
BuildRequires: pkgconfig(systemd)
+
+# Build upstream docs with pandoc
+BuildRequires: pandoc
+
Requires: systemd-units
-%else
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(postun): initscripts
-%endif
# need xz to work with ubuntu images
# https://bugzilla.redhat.com/show_bug.cgi?id=1045220
Requires: xz
-# https://bugzilla.redhat.com/show_bug.cgi?id=1035436
-# this won't be needed for rhel7+
-%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
-Requires: bridge-utils
-Requires: lxc
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1034919
-# No longer needed in Fedora because of libcontainer
-Requires: libcgroup
-%endif
Provides: lxc-docker = %{version}
@@ -82,10 +62,7 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-%if 0%{?rhel}
%patch0 -p1 -b ignore-btrfs-for-rhel
-%patch90 -p1 -b docker-0.9-el6-lxc
-%endif
%patch1 -p1 -b upstream-patched-archive-tar
%build
@@ -97,9 +74,11 @@ pushd _build
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
+export DOCKER_BUILDTAGS='selinux'
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
+contrib/man/md/md2man-all.sh
cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax
cp contrib/syntax/vim/README.md README-vim-syntax.md
@@ -129,45 +108,23 @@ install -d %{buildroot}%{_sysconfdir}/udev/rules.d
install -p -m 755 contrib/udev/80-docker.rules %{buildroot}%{_sysconfdir}/udev/rules.d
# install storage dir
install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
-# install systemd/init scripts
-%if %{with systemd}
+# install systemd unitfile
install -d %{buildroot}%{_unitdir}
-install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
-%else
-install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/docker
-install -d %{buildroot}%{_initddir}
-install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker
-%endif
+#install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
exit 0
%post
-%if %{with systemd}
%systemd_post docker
-%else
-# install but don't activate
-/sbin/chkconfig --add docker
-%endif
%preun
-%if %{with systemd}
%systemd_preun docker
-%else
-/sbin/service docker stop >/dev/null 2>&1
-/sbin/chkconfig --del docker
-%endif
%postun
-%if %{with systemd}
%systemd_postun_with_restart docker
-%else
-if [ "$1" -ge "1" ] ; then
- /sbin/service docker condrestart >/dev/null 2>&1 || :
-fi
-%endif
%files
%defattr(-,root,root,-)
@@ -177,12 +134,7 @@ fi
%{_bindir}/docker
%dir %{_libexecdir}/docker
%{_libexecdir}/docker/dockerinit
-%if %{with systemd}
%{_unitdir}/docker.service
-%else
-%config(noreplace) %{_sysconfdir}/sysconfig/docker
-%{_initddir}/docker
-%endif
%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/bash_completion.d/docker.bash
%{_datadir}/zsh/site-functions/_docker
@@ -197,6 +149,11 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Mon May 12 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-3
+- enable selinux
+- delete rhel/fedora conditionals
+- generate manpages during build
+
* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-2
- regenerate btrfs removal patch
- update commit value
diff --git a/docker.service b/docker.service
new file mode 100644
index 0000000..1a63071
--- /dev/null
+++ b/docker.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.io
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/docker -d --selinux-enabled
+Restart=on-failure
+LimitNOFILE=1048576
+LimitNPROC=1048576
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ignore-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch
index 5a14235..dfd480e 100644
--- a/ignore-btrfs-for-rhel.patch
+++ b/ignore-btrfs-for-rhel.patch
@@ -1,6 +1,15 @@
-diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go
---- docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go 2014-04-08 17:49:33.000000000 -0400
-+++ docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go 1969-12-31 19:00:00.000000000 -0500
+diff -uNr docker-0.11.1/daemon/daemon_btrfs.go docker-0.11.1-1/daemon/daemon_btrfs.go
+--- docker-0.11.1/daemon/daemon_btrfs.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/daemon/daemon_btrfs.go 2014-05-12 11:05:34.886668685 -0400
+@@ -3,5 +3,4 @@
+ package daemon
+
+ import (
+- _ "github.com/dotcloud/docker/daemon/graphdriver/btrfs"
+ )
+diff -uNr docker-0.11.1/daemon/graphdriver/btrfs/btrfs.go docker-0.11.1-1/daemon/graphdriver/btrfs/btrfs.go
+--- docker-0.11.1/daemon/graphdriver/btrfs/btrfs.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/daemon/graphdriver/btrfs/btrfs.go 1969-12-31 19:00:00.000000000 -0500
@@ -1,213 +0,0 @@
-// +build linux,amd64
-
@@ -15,7 +24,7 @@ diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runti
-
-import (
- "fmt"
-- "github.com/dotcloud/docker/runtime/graphdriver"
+- "github.com/dotcloud/docker/daemon/graphdriver"
- "os"
- "path"
- "syscall"
@@ -84,7 +93,7 @@ diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runti
- return uintptr(C.dirfd(dir))
-}
-
--func subvolCreate(path, name string, mountLabel string) error {
+-func subvolCreate(path, name string) error {
- dir, err := openDir(path)
- if err != nil {
- return err
@@ -159,17 +168,17 @@ diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runti
- return path.Join(d.subvolumesDir(), id)
-}
-
--func (d *Driver) Create(id string, parent string, mountLabel string) error {
+-func (d *Driver) Create(id string, parent string) error {
- subvolumes := path.Join(d.home, "subvolumes")
- if err := os.MkdirAll(subvolumes, 0700); err != nil {
- return err
- }
- if parent == "" {
-- if err := subvolCreate(subvolumes, id, mountLabel); err != nil {
+- if err := subvolCreate(subvolumes, id); err != nil {
- return err
- }
- } else {
-- parentDir, err := d.Get(parent)
+- parentDir, err := d.Get(parent, "")
- if err != nil {
- return err
- }
@@ -191,7 +200,7 @@ diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runti
- return os.RemoveAll(dir)
-}
-
--func (d *Driver) Get(id string) (string, error) {
+-func (d *Driver) Get(id, mountLabel string) (string, error) {
- dir := d.subvolumesDirId(id)
- st, err := os.Stat(dir)
- if err != nil {
@@ -215,19 +224,15 @@ diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runti
- _, err := os.Stat(dir)
- return err == nil
-}
-diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go
---- docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go 2014-04-08 17:49:33.000000000 -0400
-+++ docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go 1969-12-31 19:00:00.000000000 -0500
+diff -uNr docker-0.11.1/daemon/graphdriver/btrfs/dummy_unsupported.go docker-0.11.1-1/daemon/graphdriver/btrfs/dummy_unsupported.go
+--- docker-0.11.1/daemon/graphdriver/btrfs/dummy_unsupported.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/daemon/graphdriver/btrfs/dummy_unsupported.go 1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-// +build !linux !amd64
-
-package btrfs
-diff -uNr docker-0.10.0/runtime/runtime_btrfs.go docker-0.10.0-1/runtime/runtime_btrfs.go
---- docker-0.10.0/runtime/runtime_btrfs.go 2014-04-08 17:49:33.000000000 -0400
-+++ docker-0.10.0-1/runtime/runtime_btrfs.go 2014-04-14 11:47:23.665041947 -0400
-@@ -3,5 +3,4 @@
- package runtime
-
- import (
-- _ "github.com/dotcloud/docker/runtime/graphdriver/btrfs"
- )
+diff -uNr docker-0.11.1/daemon/graphdriver/btrfs/MAINTAINERS docker-0.11.1-1/daemon/graphdriver/btrfs/MAINTAINERS
+--- docker-0.11.1/daemon/graphdriver/btrfs/MAINTAINERS 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/daemon/graphdriver/btrfs/MAINTAINERS 1969-12-31 19:00:00.000000000 -0500
+@@ -1 +0,0 @@
+-Alexander Larsson <alexl(a)redhat.com> (@alexlarsson)
diff --git a/sources b/sources
index 8f84b86..6c0b0dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a9b569b1627a51b0ce6e85eaad459c4 v0.10.0.tar.gz
+6496901bfc30aa8094411a0dd6c10ab5 v0.11.1.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
index 225b1ab..7791d82 100644
--- a/upstream-patched-archive-tar.patch
+++ b/upstream-patched-archive-tar.patch
@@ -1,8 +1,7 @@
-diff --git a/archive/archive.go b/archive/archive.go
-index 2fac18e..634e9c1 100644
---- a/archive/archive.go
-+++ b/archive/archive.go
-@@ -8,7 +8,7 @@ import (
+diff -uNr docker-0.11.1/archive/archive.go docker-0.11.1-1/archive/archive.go
+--- docker-0.11.1/archive/archive.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/archive.go 2014-05-12 11:13:56.346022537 -0400
+@@ -8,7 +8,7 @@
"fmt"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
@@ -11,11 +10,10 @@ index 2fac18e..634e9c1 100644
"io"
"io/ioutil"
"os"
-diff --git a/archive/archive_test.go b/archive/archive_test.go
-index 4126601..ca5a80c 100644
---- a/archive/archive_test.go
-+++ b/archive/archive_test.go
-@@ -3,7 +3,7 @@ package archive
+diff -uNr docker-0.11.1/archive/archive_test.go docker-0.11.1-1/archive/archive_test.go
+--- docker-0.11.1/archive/archive_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/archive_test.go 2014-05-12 11:13:46.713977937 -0400
+@@ -3,7 +3,7 @@
import (
"bytes"
"fmt"
@@ -24,11 +22,10 @@ index 4126601..ca5a80c 100644
"io"
"io/ioutil"
"os"
-diff --git a/archive/changes.go b/archive/changes.go
-index 723e4a7..51baa22 100644
---- a/archive/changes.go
-+++ b/archive/changes.go
-@@ -5,7 +5,7 @@ import (
+diff -uNr docker-0.11.1/archive/changes.go docker-0.11.1-1/archive/changes.go
+--- docker-0.11.1/archive/changes.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/changes.go 2014-05-12 11:13:37.413934009 -0400
+@@ -5,7 +5,7 @@
"fmt"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
@@ -37,11 +34,10 @@ index 723e4a7..51baa22 100644
"io"
"os"
"path/filepath"
-diff --git a/archive/diff.go b/archive/diff.go
-index e20e4b1..a67b48a 100644
---- a/archive/diff.go
-+++ b/archive/diff.go
-@@ -2,7 +2,7 @@ package archive
+diff -uNr docker-0.11.1/archive/diff.go docker-0.11.1-1/archive/diff.go
+--- docker-0.11.1/archive/diff.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/diff.go 2014-05-12 11:13:27.070884840 -0400
+@@ -2,7 +2,7 @@
import (
"fmt"
@@ -50,11 +46,10 @@ index e20e4b1..a67b48a 100644
"io"
"io/ioutil"
"os"
-diff --git a/archive/wrap.go b/archive/wrap.go
-index 03ea508..0abe320 100644
---- a/archive/wrap.go
-+++ b/archive/wrap.go
-@@ -2,7 +2,7 @@ package archive
+diff -uNr docker-0.11.1/archive/wrap.go docker-0.11.1-1/archive/wrap.go
+--- docker-0.11.1/archive/wrap.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/wrap.go 2014-05-12 11:14:03.103055123 -0400
+@@ -2,7 +2,7 @@
import (
"bytes"
@@ -63,37 +58,34 @@ index 03ea508..0abe320 100644
"io/ioutil"
)
-diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go
-index 1777391..5cfe4c2 100644
---- a/graph/tags_unit_test.go
-+++ b/graph/tags_unit_test.go
-@@ -6,7 +6,7 @@ import (
- "github.com/dotcloud/docker/runtime/graphdriver"
- _ "github.com/dotcloud/docker/runtime/graphdriver/vfs" // import the vfs driver so it is used in the tests
+diff -uNr docker-0.11.1/graph/tags_unit_test.go docker-0.11.1-1/graph/tags_unit_test.go
+--- docker-0.11.1/graph/tags_unit_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/graph/tags_unit_test.go 2014-05-12 11:14:12.608099648 -0400
+@@ -6,7 +6,7 @@
+ _ "github.com/dotcloud/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests
+ "github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/utils"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
+ "archive/tar"
"io"
"os"
"path"
-diff --git a/integration/api_test.go b/integration/api_test.go
-index 26441a2..a313382 100644
---- a/integration/api_test.go
-+++ b/integration/api_test.go
-@@ -21,7 +21,7 @@ import (
+diff -uNr docker-0.11.1/integration/api_test.go docker-0.11.1-1/integration/api_test.go
+--- docker-0.11.1/integration/api_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/integration/api_test.go 2014-05-12 11:14:32.203193162 -0400
+@@ -21,7 +21,7 @@
+ "github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/runconfig"
- "github.com/dotcloud/docker/runtime"
"github.com/dotcloud/docker/utils"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
+ "archive/tar"
)
func TestGetEvents(t *testing.T) {
-diff --git a/integration/utils_test.go b/integration/utils_test.go
-index 8ad6ccb..5b16f2a 100644
---- a/integration/utils_test.go
-+++ b/integration/utils_test.go
-@@ -3,7 +3,7 @@ package docker
+diff -uNr docker-0.11.1/integration/utils_test.go docker-0.11.1-1/integration/utils_test.go
+--- docker-0.11.1/integration/utils_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/integration/utils_test.go 2014-05-12 11:14:23.329149517 -0400
+@@ -3,7 +3,7 @@
import (
"bytes"
"fmt"
@@ -102,11 +94,10 @@ index 8ad6ccb..5b16f2a 100644
"io"
"io/ioutil"
"net/http"
-diff --git a/utils/tarsum.go b/utils/tarsum.go
-index 67e94aa..5132194 100644
---- a/utils/tarsum.go
-+++ b/utils/tarsum.go
-@@ -5,7 +5,7 @@ import (
+diff -uNr docker-0.11.1/utils/tarsum.go docker-0.11.1-1/utils/tarsum.go
+--- docker-0.11.1/utils/tarsum.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/utils/tarsum.go 2014-05-12 11:14:41.322234586 -0400
+@@ -5,7 +5,7 @@
"compress/gzip"
"crypto/sha256"
"encoding/hex"
10 years
[golang] not sure why go1.2.2 shuffled some of the arch-depenedent files, but so it goes
by Vincent Batts
commit 573d0baf6acb69f8fd279fd74b7c45b00463072b
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Mon May 12 09:29:32 2014 -0400
not sure why go1.2.2 shuffled some of the arch-depenedent files, but so it goes
golang.spec | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index ae77ac1..22736e1 100644
--- a/golang.spec
+++ b/golang.spec
@@ -39,7 +39,7 @@
Name: golang
Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Go Programming Language
License: BSD
@@ -636,9 +636,14 @@ fi
%{goroot}/src/
# files that are generated based on compile-time ARCH will go in that arch's pkg-bin-*
%ifarch %{ix86}
-%exclude %{goroot}/src/cmd/8l/enam.c
+
+# this is wacky that now these files are generated in a different arch
+#%exclude %{goroot}/src/cmd/8l/enam.c
+#%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go
+%exclude %{goroot}/src/cmd/6l/enam.c
+%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
+
%exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h
-%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_386.c
%exclude %{goroot}/src/pkg/runtime/zmprof_linux_386.c
%exclude %{goroot}/src/pkg/runtime/znetpoll_linux_386.c
@@ -652,9 +657,7 @@ fi
%endif
%ifarch x86_64
-%exclude %{goroot}/src/cmd/6l/enam.c
%exclude %{goroot}/src/pkg/runtime/zasm_linux_amd64.h
-%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
%exclude %{goroot}/src/pkg/runtime/zmprof_linux_amd64.c
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_amd64.c
%exclude %{goroot}/src/pkg/runtime/znetpoll_linux_amd64.c
@@ -895,6 +898,9 @@ fi
%changelog
+* Fri May 09 2014 Vincent Batts <vbatts(a)redhat.com> 1.2.2-2
+- more arch file shuffling
+
* Fri May 09 2014 Vincent Batts <vbatts(a)redhat.com> 1.2.2-1
- update to go1.2.2
10 years
