[golang/el6: 3/3] Merge branch 'master' into el6
by Vincent Batts
commit 766dafab1bd8ae43a33483d46263bc112e1486bf
Merge: adb88d9 4e1713b
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Tue Nov 26 16:04:22 2013 -0500
Merge branch 'master' into el6
golang.spec | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
---
10 years, 5 months
[golang/el6: 2/3] version bump
by Vincent Batts
commit 4e1713bb7ecd3baf5bbbad636e10aa1e673c6d78
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Tue Nov 26 16:03:49 2013 -0500
version bump
golang.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 15a318e..813474c 100644
--- a/golang.spec
+++ b/golang.spec
@@ -25,7 +25,7 @@
Name: golang
Version: 1.1.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: The Go Programming Language
License: BSD
@@ -307,6 +307,9 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
%changelog
+* Tue Nov 26 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-8
+- fix the rpmspec conditional for rhel and fedora
+
* Thu Nov 21 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-7
- patch tests for testing on rawhide
- let the same spec work for rhel and fedora
10 years, 5 months
[golang/el6: 1/3] messed up the rpmspec conditional
by Vincent Batts
commit d290a3d331ddf8150ea3a2bc75137ad392c1b180
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Tue Nov 26 16:02:22 2013 -0500
messed up the rpmspec conditional
golang.spec | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index b5d46b5..15a318e 100644
--- a/golang.spec
+++ b/golang.spec
@@ -42,7 +42,7 @@ BuildRequires: /bin/hostname
BuildRequires: emacs
# xemacs on fedora only
-%if 0%{?fedora} >= 0
+%if 0%{?fedora}
BuildRequires: xemacs xemacs-packages-extra
%endif
@@ -93,7 +93,7 @@ Summary: The Go Programming Language documentation tool
%package vim
Summary: Vim plugins for Go
# xemacs on fedora only
-%if 0%{?fedora} >= 0
+%if 0%{?fedora}
Requires: vim-filesystem
%endif
BuildArch: noarch
@@ -112,7 +112,7 @@ BuildArch: noarch
# xemacs on fedora only
-%if 0%{?fedora} >= 0
+%if 0%{?fedora}
%package -n xemacs-%{name}
Summary: XEmacs add-on package for Go
Requires: xemacs(bin) >= %{_xemacs_version}
@@ -181,7 +181,7 @@ cd ..
cd misc
mv emacs/go-mode-load.el emacs/%{name}-init.el
# xemacs on fedora only
-%if 0%{?fedora} >= 0
+%if 0%{?fedora}
cp -av emacs xemacs
%{_xemacs_bytecompile} xemacs/go-mode.el
%endif
@@ -236,7 +236,7 @@ cp -av misc/emacs/go-mode.* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
cp -av misc/emacs/%{name}-init.el $RPM_BUILD_ROOT%{_emacs_sitestartdir}
# xemacs on fedora only
-%if 0%{?fedora} >= 0
+%if 0%{?fedora}
# misc/xemacs
mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
@@ -298,7 +298,7 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
# xemacs on fedora only
-%if 0%{?fedora} >= 0
+%if 0%{?fedora}
%files -n xemacs-%{name}
%doc AUTHORS CONTRIBUTORS LICENSE PATENTS
%{_xemacs_sitelispdir}/%{name}
10 years, 5 months
[docker-io] Upstream release 0.7.0
by Marek Goldmann
commit 2b4214c22ecc24d0fc6f24c653f0c34b88fcd863
Author: Marek Goldmann <marek.goldmann(a)gmail.com>
Date: Tue Nov 26 09:54:44 2013 +0100
Upstream release 0.7.0
.gitignore | 1 +
docker-bridge_flag.patch | 16 ----------------
docker-io.spec | 41 ++++++++++++++++++-----------------------
sources | 2 +-
4 files changed, 20 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e646e94..11eea8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/docker-268e386.tar.gz
/docker-9af7730.tar.gz
/docker-ea7811c.tar.gz
+/v0.7.0.tar.gz
diff --git a/docker-io.spec b/docker-io.spec
index eaaec20..48a9670 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,22 +9,21 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit ea7811c83d913db91948cd4f696cf34b139da855
+%global commit 0d078b65817fc91eba916652b3f087a6c2eef851
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.7
-Release: 0.20.rc7%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: docker-0.7-remove-dotcloud-tar.patch
Patch1: docker-0.7-el6-docs.patch
-Patch2: docker-bridge_flag.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/crosbymichael/docker/archive/%{commit}/docker-%{shortc...
+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
@@ -60,33 +59,25 @@ 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.
%prep
-%setup -q -n docker-%{commit}
+%setup -q -n docker-%{version}
rm -rf vendor
%patch0 -p1 -b docker-0.7-remove-dotcloud-tar.patch
%if 0%{?rhel} >= 6
%patch1 -p1 -b docker-0.7-el6-docs.patch
%endif
-%patch2 -p1 -b none-bridge
%build
mkdir _build
+
pushd _build
+ mkdir -p src/github.com/dotcloud
+ ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
+popd
-mkdir -p src/github.com/dotcloud
-ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
-export GOPATH=$(pwd):%{gopath}
-# passing version information build flags BZ #1017186
-export LDFLAGS="-X main.GITCOMMIT '%{shortcommit}/%{release}' -X main.VERSION '%{version}' -w"
-export LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.IAMSTATIC true"
-export BUILDFLAGS="-tags netgo"
-go build -v -a -ldflags \
- "$LDFLAGS -linkmode external -extldflags '-lpthread -static -Wl,--unresolved-symbols=ignore-in-object-files' $LDFLAGS_STATIC" \
- $BUILDFLAGS \
- github.com/dotcloud/docker/dockerinit
-export DOCKER_INITSHA1="$(sha1sum dockerinit | cut -d' ' -f1)"
-go build -v -a -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS github.com/dotcloud/docker/docker
+export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
+export GOPATH=$(pwd)/_build:%{gopath}
-popd
+hack/make.sh dynbinary
make -C docs/ man
@@ -97,8 +88,8 @@ install -d %{buildroot}%{_mandir}/man1
install -d %{buildroot}%{_sysconfdir}/bash_completion.d
install -d %{buildroot}%{_datadir}/zsh/site-functions
install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
-install -p -m 755 _build/docker %{buildroot}%{_bindir}/docker
-install -p -m 755 _build/dockerinit %{buildroot}%{_libexecdir}/docker
+install -p -m 755 bundles/%{version}/dynbinary/docker-%{version} %{buildroot}%{_bindir}/docker
+install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit
install -p -m 644 docs/_build/man/docker.1 %{buildroot}%{_mandir}/man1
install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash
install -p -m 644 contrib/completion/zsh/_docker %{buildroot}%{_datadir}/zsh/site-functions
@@ -156,6 +147,10 @@ exit 0
%dir %{_sharedstatedir}/docker
%changelog
+* Tue Nov 26 2013 Marek Goldmann <mgoldman(a)redhat.com> - 0.7.0-1
+- Upstream release 0.7.0
+- Using upstream script to build the binary
+
* Mon Nov 25 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7-0.20.rc7
- correct the build time defines (bz#1026545). Thanks dan-fedora.
diff --git a/sources b/sources
index 0e4ebfa..b0fdf17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-852051f88f023aa84db32e98751f834a docker-ea7811c.tar.gz
+bc5e2aa1fbcd3ab8fac1a4f6a4613a16 v0.7.0.tar.gz
10 years, 5 months