jchaloup pushed to cadvisor (f21). "Fix broken dependencies (..more)"

Sat Mar 28 11:03:00 UTC 2015

>From 83ccd33cce7a77fe5013fbfda89aa614936723a4 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Fri, 27 Mar 2015 15:46:22 +0100
Subject: Fix broken dependencies Convert int64 to float64 when calling
 HumanSize - related: #1141896

diff --git a/0001-int64-to-float64-conversion.patch b/0001-int64-to-float64-conversion.patch
new file mode 100644
index 0000000..b2957b4
--- /dev/null
+++ b/0001-int64-to-float64-conversion.patch
@@ -0,0 +1,25 @@
+From b77f46755189d6903f1b6c3432f86cd07dd05f6e Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Fri, 27 Mar 2015 15:42:13 +0100
+Subject: [PATCH] int64 to float64 conversion
+
+---
+ manager/container.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/manager/container.go b/manager/container.go
+index e4e5b68..8a19794 100644
+--- a/manager/container.go
++++ b/manager/container.go
+@@ -169,7 +169,7 @@ func (c *containerData) housekeeping() {
+ 				usageMemory := stats[1].Memory.Usage
+ 
+ 				usageInCores := float64(usageCpuNs) / float64(stats[1].Timestamp.Sub(stats[0].Timestamp).Nanoseconds())
+-				usageInHuman := units.HumanSize(int64(usageMemory))
++				usageInHuman := units.HumanSize(float64(usageMemory))
+ 				glog.Infof("[%s] %.3f cores, %s of memory", c.info.Name, usageInCores, usageInHuman)
+ 			}
+ 		}
+-- 
+1.9.3
+
diff --git a/cadvisor.spec b/cadvisor.spec
index 0d150b3..92df715 100644
--- a/cadvisor.spec
+++ b/cadvisor.spec
@@ -10,7 +10,7 @@
 
 Name:		%{repo}
 Version:	0.6.2
-Release:	0.1.git%{shortcommit}%{?dist}
+Release:	0.3.git%{shortcommit}%{?dist}
 Summary:	Analyzes resource usage and performance characteristics of running containers
 License:	ASL 2.0
 URL:		https://%{import_path}
@@ -19,36 +19,41 @@ Source1:	cadvisor
 Source2:	cadvisor.service
 
 Patch0:		0001-support-the-new-libcontiner.patch
+Patch1:		0001-int64-to-float64-conversion.patch
 
 BuildRequires:	docker-io-pkg-devel
 BuildRequires:	git
 BuildRequires:	systemd
 BuildRequires:	glibc-static
 BuildRequires:	golang >= 1.2.1-3
+BuildRequires:  golang(code.google.com/p/goauth2/oauth)
+BuildRequires:  golang(code.google.com/p/goauth2/oauth/jwt)
+BuildRequires:	golang(code.google.com/p/go.exp)
+BuildRequires:	golang(code.google.com/p/gomock)
+BuildRequires:  golang(code.google.com/p/google-api-go-client/bigquery/v2)
+BuildRequires:  golang(code.google.com/p/google-api-go-client/googleapi)
+BuildRequires:  golang(code.google.com/p/google-api-go-client/googleapi/internal/uritemplates)
+BuildRequires:	golang(github.com/codegangsta/cli)
+BuildRequires:	golang(github.com/coreos/go-systemd/dbus)
+BuildRequires:	golang(github.com/docker/docker)
+BuildRequires:	golang(github.com/docker/libcontainer)
 BuildRequires:	golang(github.com/docker/libcontainer) >= 1.2.0-3.git28cb5f9
 BuildRequires:	golang(github.com/fsouza/go-dockerclient)
-BuildRequires:	golang(github.com/coreos/go-systemd)
 BuildRequires:	golang(github.com/godbus/dbus)
-BuildRequires:	golang(github.com/kr/text)
-BuildRequires:	golang(github.com/kr/pretty)
-BuildRequires:	golang(github.com/influxdb/influxdb/client)
-BuildRequires:	golang(github.com/stretchr/testify)
-BuildRequires:	golang(github.com/stretchr/objx)
 BuildRequires:	golang(github.com/golang/glog)
-BuildRequires:	golang(github.com/codegangsta/cli)
-BuildRequires:	golang(github.com/docker/docker)
-BuildRequires:	golang(github.com/docker/libcontainer)
 BuildRequires:	golang(github.com/gorilla/mux)
+BuildRequires:	golang(github.com/influxdb/influxdb/client)
+BuildRequires:	golang(github.com/kr/pretty)
 BuildRequires:	golang(github.com/kr/pty)
+BuildRequires:	golang(github.com/kr/text)
 BuildRequires:	golang(github.com/onsi/ginkgo)
 BuildRequires:	golang(github.com/onsi/gomega)
 BuildRequires:	golang(github.com/SeanDolphin/bqschema)
+BuildRequires:  golang(github.com/Sirupsen/logrus)
+BuildRequires:	golang(github.com/stretchr/objx)
+BuildRequires:	golang(github.com/stretchr/testify)
 BuildRequires:	golang(github.com/syndtr/gocapability/capability)
-BuildRequires:	golang(code.google.com/p/goauth2)
-BuildRequires:	golang(code.google.com/p/go.exp)
-BuildRequires:	golang(code.google.com/p/gomock)
-BuildRequires:	golang(code.google.com/p/google-api-go-client)
-Requires:	docker-io
+
 ExclusiveArch:	x86_64 
 
 %description
@@ -93,31 +98,6 @@ Provides:	golang(%{import_path}/utils) = %{version}-%{release}
 Provides:	golang(%{import_path}/utils/fs) = %{version}-%{release}
 Provides:	golang(%{import_path}/utils/fs/mockfs) = %{version}-%{release}
 Provides:	golang(%{import_path}/utils/procfs) = %{version}-%{release}
-BuildRequires:	docker-io-pkg-devel
-BuildRequires:	golang
-BuildRequires:	golang(github.com/docker/libcontainer)
-BuildRequires:	golang(github.com/fsouza/go-dockerclient)
-BuildRequires:	golang(github.com/coreos/go-systemd)
-BuildRequires:	golang(github.com/godbus/dbus)
-BuildRequires:	golang(github.com/kr/text)
-BuildRequires:	golang(github.com/kr/pretty)
-BuildRequires:	golang(github.com/influxdb/influxdb/client)
-BuildRequires:	golang(github.com/stretchr/testify)
-BuildRequires:	golang(github.com/stretchr/objx)
-BuildRequires:	golang(github.com/codegangsta/cli)
-BuildRequires:	golang(github.com/docker/docker)
-BuildRequires:	golang(github.com/docker/libcontainer)
-BuildRequires:	golang(github.com/golang/glog)
-BuildRequires:	golang(github.com/gorilla/mux)
-BuildRequires:	golang(github.com/kr/pty)
-BuildRequires:	golang(github.com/onsi/ginkgo)
-BuildRequires:	golang(github.com/onsi/gomega)
-BuildRequires:	golang(github.com/SeanDolphin/bqschema)
-BuildRequires:	golang(github.com/syndtr/gocapability/capability)
-BuildRequires:	golang(code.google.com/p/goauth2)
-BuildRequires:	golang(code.google.com/p/go.exp)
-BuildRequires:	golang(code.google.com/p/gomock)
-BuildRequires:	golang(code.google.com/p/google-api-go-client)
 
 %description devel
 %{summary}
@@ -212,6 +192,11 @@ done
 %{gopath}/src/%{import_path}/utils/*
 
 %changelog
+* Thu Mar 26 2015 jchaloup <jchaloup at redhat.com> - 0.6.2-0.3.git89088df
+- Fix broken dependencies
+- Convert int64 to float64 when calling HumanSize
+  related: #1141896
+
 * Fri Dec 12 2014 jchaloup <jchaloup at redhat.com> - 0.6.2-0.1.git89088df
 - remove -q option from autosetup, it is not supported
   related: #1141896
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cadvisor.git/commit/?h=f21&id=83ccd33cce7a77fe5013fbfda89aa614936723a4
