rpms/powertop
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'origin/f16' into f17

Browse Source 
Conflicts:
	powertop.spec
This commit is contained in:
Jaroslav Škarvada 2012-03-07 17:26:11 +01:00
commit ec7fc6769f
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
powertop-1.98-power-supply-units-fix.patch Normal file
View File

@ -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;

8
powertop.spec
View File

@ -1,6 +1,6 @@
Name: powertop
Version: 1.98
Release: 5%{?dist}
Release: 6%{?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@redhat.com> - 1.98-6
- Fixed power_supply units
Resolves: rhbz#800814
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.98-5
- Rebuilt for c++ ABI breakage