From 31c8ea321573a2c603c92dfadae912b9ef93ea6d Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: May 23 2016 14:22:42 +0000
Subject: Bump to upstream 546a3771589bdb356777c646c6eca24914fdd48b

- resolves: #1256978

---

diff --git a/cadvisor.spec b/cadvisor.spec
index 00079e0..698c115 100644
--- a/cadvisor.spec
+++ b/cadvisor.spec
@@ -39,7 +39,8 @@ Source1:        cadvisor
 Source2:        cadvisor.service
 
 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 ppc64le
+# arm does not have zfs-fuse
+ExclusiveArch:  %{ix86} x86_64 aarch64 ppc64le
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 
@@ -238,10 +239,12 @@ Summary:         Unit tests for %{name} package
 %if 0%{?with_check}
 #Here comes all BuildRequires: PACKAGE the unit tests
 #in %%check section need for running
+BuildRequires:   golang(github.com/kr/pretty)
 %endif
 
 # test subpackage tests code from devel subpackage
 Requires:        %{name}-devel = %{version}-%{release}
+Requires:        golang(github.com/kr/pretty)
 
 %description unit-test
 %{summary}
@@ -331,17 +334,18 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %gotest %{import_path}/cache/memory
 %gotest %{import_path}/client
 %gotest %{import_path}/client/v2
-#%gotest %{import_path}/collector
-%gotest %{import_path}/container
+#%%gotest %{import_path}/collector
+# undefined: FactoryForMockContainerHandler
+#%%gotest %{import_path}/container
 %gotest %{import_path}/container/raw
 %gotest %{import_path}/events
 %gotest %{import_path}/fs
 %gotest %{import_path}/info/v1
 # requires root
-#gotest %%{import_path}/integration/tests/api
+#%%gotest %%{import_path}/integration/tests/api
 # mostly likely requires kubernetes running
-#gotest %%{import_path}/integration/tests/healthz
-#%gotest %{import_path}/manager
+#%%gotest %%{import_path}/integration/tests/healthz
+#%%gotest %{import_path}/manager
 %gotest %{import_path}/metrics
 %gotest %{import_path}/storage/influxdb
 %gotest %{import_path}/summary