5:57 p.m.
commit a0a8e80e85cc9e8e65932a607b000b806ac4a1fc
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Fri May 2 18:57:49 2014 -0400
release 6
.gitignore | 1 +
geard.spec | 43 +++++++++++++++++++++++++++++++------------
sources | 2 +-
3 files changed, 33 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 990f891..cae0f6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/geard-b31df16.tar.gz
+/geard-7fd4f55.tar.gz
diff --git a/geard.spec b/geard.spec
index cb460c6..86d4e9d 100644
--- a/geard.spec
+++ b/geard.spec
@@ -1,18 +1,26 @@
+%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
+
#debuginfo not supported with Go
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit b31df169159ae562b24bee6e6851e5deaef10353
+%global commit 7fd4f55df7f657c6c6cf424b01dd46ca6ce28353
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: geard
Version: 0
-Release: 0.3.git%{shortcommit}%{?dist}
+Release: 0.6.git%{shortcommit}%{?dist}
Summary: CLI client for installing Docker images as containers
License: ASL 2.0
URL: http://github.com/openshift/geard
ExclusiveArch: x86_64
-Source0:
https://github.com/openshift/geard/archive/%{commit}/geard-%{shortcommit}...
+Source0:
https://github.com/kraman/geard/archive/%{commit}/geard-%{shortcommit}.ta...
+#BuildRequires: glibc-static
# ensure build uses golang 1.2-7 and above
BuildRequires: gcc
BuildRequires: golang >= 1.2-7
@@ -26,13 +34,13 @@ BuildRequires: golang(github.com/spf13/pflag)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
BuildRequires: libselinux-devel
+# btrfs not available for rhel yet
BuildRequires: pkgconfig(systemd)
Requires: systemd-units
-Requires: docker-io
+Requires: /usr/bin/docker
%description
-geard is a command line client for installing Docker images as containers
-onto a systemd-enabled Linux operating system (systemd 207 or newer).
+%{summary}
%prep
%setup -q -n geard-%{commit}
@@ -46,7 +54,7 @@ pushd _build
popd
export GOPATH=$(pwd)/_build
-contrib/build -s -l
+contrib/build -s -l -n
%install
# install binary
@@ -82,12 +90,23 @@ install -d -p %{buildroot}%{_sharedstatedir}/containers
%dir %{_sharedstatedir}/containers
%changelog
-* Sat Apr 12 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0-0.3.git
-- update description
-- remove unused conditionals and comments
+* Fri May 02 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0-0.6.git
+- release 6
+
+* Tue Apr 29 2014 Colin Walters <walters(a)redhat.com> - 0-0.5.1.git
+- Change requires to be /usr/bin/docker to adapt to package rename
+
+* Fri Apr 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0-0.5.git
+- release 5
+
+* Thu Apr 10 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0-0.4.git
+- docs update, only run daemon in unitfile
+
+* Wed Apr 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0-0.3.git
+- make geard aware of binaries' locations
-* Sat Apr 12 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0-0.2.git
-- Bug 1086378 - cleanup as per package review
+* Tue Apr 08 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0-0.2.git
+- systemd pre post operations
* Mon Apr 07 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0-0.1.git
- initial package
diff --git a/sources b/sources
index 99a100b..4be67f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-062d9fa9957f38f5b5f369092f02d00d geard-b31df16.tar.gz
+f56db613c1f40a45fa64d3c3dccf7051 geard-7fd4f55.tar.gz