jchaloup pushed to cadvisor (master). "Update to 0.15.1 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Jun 11 13:14:49 UTC 2015


From 62ba1e6a53e9a958d49ec1fde7be6dfe765a361a Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Thu, 11 Jun 2015 11:31:43 +0200
Subject: Update to 0.15.1 - related: #1219972


diff --git a/.gitignore b/.gitignore
index 5e49cf2..f9a4c72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cadvisor-40b1ad9.tar.gz
+/cadvisor-ec588de.tar.gz
diff --git a/cadvisor.spec b/cadvisor.spec
index 61a79ec..837714a 100644
--- a/cadvisor.spec
+++ b/cadvisor.spec
@@ -18,12 +18,12 @@
 %global provider_tld	com
 %global project		google
 %global repo		cadvisor
-%global commit		40b1ad980dceecf0bebafe851b1e39038c8b09e7
+%global commit		ec588def40e1bb59f28f5a293b279f6762d13d44
 %global import_path	%{provider}.%{provider_tld}/%{project}/%{repo}
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 Name:		%{repo}
-Version:	0.14.0
+Version:	0.15.1
 Release:	1%{?dist}
 Summary:	Analyzes resource usage and performance characteristics of running containers
 License:	ASL 2.0
@@ -217,16 +217,21 @@ pushd _build
   ln -s $(dirs +1 -l) src/github.com/google/cadvisor
 popd
 
+%if 0%{?with_debug}
+function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -v -x "$@"; }
+%else
+function gobuild { go build -a "$@"; }
+%endif
+
 %if 0%{?with_bundled}
 export GOPATH=$(pwd)/Godeps/_workspace:$(pwd)/_build:%{gopath}
-go build github.com/google/cadvisor
 %else
 export GOPATH=$(pwd)/_build:%{gopath}
-function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -v -x "$@"; }
-gobuild %{import_path}
-#go build --ldflags '-extldflags "-static"' github.com/google/cadvisor
 %endif
 
+#go build --ldflags '-extldflags "-static"' github.com/google/cadvisor
+gobuild %{import_path}
+
 %install
 # main package binary
 install -d -p %{buildroot}%{_bindir}
@@ -274,6 +279,10 @@ done
 %endif
 
 %changelog
+* Thu Jun 11 2015 jchaloup <jchaloup at redhat.com> - 0.15.1-1
+- Update to 0.15.1
+  related: #1219972
+
 * Fri Jun 05 2015 jchaloup <jchaloup at redhat.com> - 0.14.0-1
 - Update to 0.14.0
   related: #1219972
diff --git a/sources b/sources
index d35515b..e9c6edc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05db28c7e1a965fd6a3b0c82a247f493  cadvisor-40b1ad9.tar.gz
+d674db67910b7941707d03549c2a733f  cadvisor-ec588de.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cadvisor.git/commit/?h=master&id=62ba1e6a53e9a958d49ec1fde7be6dfe765a361a


More information about the scm-commits mailing list