[powertop/f16] Fixed power_supply units

[Jaroslav Škarvada]

commit 93575a3b3cdb6db761fff19dcb427ba6e5698b7e
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Mar 7 17:05:50 2012 +0100

    Fixed power_supply units
    
      Resolves: rhbz#800814

 powertop-1.98-power-supply-units-fix.patch |   25 +++++++++++++++++++++++++
 powertop.spec                              |    8 +++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/powertop-1.98-power-supply-units-fix.patch b/powertop-1.98-power-supply-units-fix.patch
new file mode 100644
index 0000000..fda2feb
--- /dev/null
+++ b/powertop-1.98-power-supply-units-fix.patch
@@ -0,0 +1,25 @@
+diff -up powertop-1.98/measurement/power_supply.cpp.orig powertop-1.98/measurement/power_supply.cpp
+--- powertop-1.98/measurement/power_supply.cpp.orig	2012-03-07 15:04:52.592471296 +0100
++++ powertop-1.98/measurement/power_supply.cpp	2012-03-07 15:07:27.743785210 +0100
+@@ -157,7 +157,7 @@ void power_supply::measure(void)
+ 	file.close();
+ 
+ 	if(_voltage) {
+-		_voltage = _voltage / 1000.0;
++		_voltage = _voltage / 1e6f;
+ 		voltage = _voltage;
+ 	} else {
+ 		voltage = 0.0;
+@@ -165,10 +165,10 @@ void power_supply::measure(void)
+ 
+ 	if(_power_rate)
+ 	{
+-		rate = _power_rate / 1000000.0;
++		rate = _power_rate / 1e6f;
+ 	}
+ 	else if(_current_rate) {
+-		_current_rate = _current_rate / 1000.0;
++		_current_rate = _current_rate / 1e6f;
+ 		rate = _current_rate * _voltage;
+ 	} else {
+ 		rate = 0.0;
diff --git a/powertop.spec b/powertop.spec
index 2a78934..3065c74 100644
--- a/powertop.spec
+++ b/powertop.spec
@@ -1,6 +1,6 @@
 Name:          powertop
 Version:       1.98
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Power consumption monitor
 
 Group:         Applications/System
@@ -13,6 +13,7 @@ Patch1:        powertop-1.98-unknown-readings-fix.patch
 Patch2:        powertop-1.98-compile-fix.patch
 Patch3:        powertop-1.98-add-power-supply-class-support.patch
 Patch4:        powertop-1.98-power-supply-add-power-now-support.patch
+Patch5:        powertop-1.98-power-supply-units-fix.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext, ncurses-devel, pciutils-devel, zlib-devel, libnl-devel
 
@@ -27,6 +28,7 @@ computer use more power than necessary while it is idle.
 %patch2 -p1 -b .compile-fix
 %patch3 -p1 -b .add-power-supply-class-support.patch
 %patch4 -p1 -b .power-supply-add-power-now-support
+%patch5 -p1 -b .power-supply-units-fix
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -59,6 +61,10 @@ rm -rf %{buildroot}
 #%{_mandir}/man8/powertop.8*
 
 %changelog
+* Wed Mar  7 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 1.98-5
+- Fixed power_supply units
+  Resolves: rhbz#800814
+
 * Fri Feb 24 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 1.98-4
 - Backported support for power_supply class
   (add-power-supply-class-support patch)