From e05946914f0abc6bf147fcbbaee53300d10149fa Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Tue, 15 May 2007 13:01:05 +0000
Subject: [PATCH] - powertop 1.2. Fixes power reports on machines that report
 power in     Amperes instead of Watts.

---
 .cvsignore                          |  2 +-
 powertop-1.1-build-fixes.patch      | 21 ---------------------
 powertop-1.2-install-man-page.patch | 17 +++++++++++++++++
 powertop.spec                       | 16 +++++++++-------
 sources                             |  2 +-
 5 files changed, 28 insertions(+), 30 deletions(-)
 delete mode 100644 powertop-1.1-build-fixes.patch
 create mode 100644 powertop-1.2-install-man-page.patch

diff --git a/.cvsignore b/.cvsignore
index a9f0312..b3fc928 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-powertop-1.1.tar.gz
+powertop-1.2.tar.gz
diff --git a/powertop-1.1-build-fixes.patch b/powertop-1.1-build-fixes.patch
deleted file mode 100644
index 0635afd..0000000
--- a/powertop-1.1-build-fixes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- powertop/Makefile.build-fixes	2007-05-13 13:22:08.000000000 -0400
-+++ powertop/Makefile	2007-05-13 21:26:01.000000000 -0400
-@@ -1,13 +1,14 @@
- BINDIR=/usr/bin
- 
--WARNFLAGS=-Wall
--CFLAGS=-O2 -g ${WARNFLAGS}
-+WARNFLAGS = -Wall
-+CFLAGS ?= -O2 -g ${WARNFLAGS}
- powertop: powertop.c config.c process.c Makefile powertop.h
- 	gcc ${CFLAGS}  powertop.c config.c process.c -o powertop
- 
- install: powertop
-+	mkdir -p ${DESTDIR}${BINDIR}
- 	cp powertop ${DESTDIR}${BINDIR}
- 	
- clean:
- 	rm -f *~ powertop
--		
-\ No newline at end of file
-+		
diff --git a/powertop-1.2-install-man-page.patch b/powertop-1.2-install-man-page.patch
new file mode 100644
index 0000000..c2207db
--- /dev/null
+++ b/powertop-1.2-install-man-page.patch
@@ -0,0 +1,17 @@
+--- powertop-1.2/Makefile.jx	2007-05-14 12:36:35.000000000 -0400
++++ powertop-1.2/Makefile	2007-05-15 08:53:06.000000000 -0400
+@@ -1,4 +1,5 @@
+ BINDIR=/usr/bin
++MANDIR=/usr/share/man/man1
+ WARNFLAGS=-Wall
+ CFLAGS?=-O2 -g ${WARNFLAGS}
+ CC?=gcc
+@@ -9,6 +10,8 @@
+ install: powertop
+ 	mkdir -p ${DESTDIR}${BINDIR}
+ 	cp powertop ${DESTDIR}${BINDIR}
++	mkdir -p ${DESTDIR}${MANDIR}
++	cp powertop.1 ${DESTDIR}${MANDIR}
+ 	
+ clean:
+ 	rm -f *~ powertop
diff --git a/powertop.spec b/powertop.spec
index 367b712..bc78171 100644
--- a/powertop.spec
+++ b/powertop.spec
@@ -1,5 +1,5 @@
 Name:           powertop
-Version:        1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        Power consumption monitor
 
@@ -9,18 +9,15 @@ URL:            http://www.linuxpowertop.org/
 Source0:        http://www.linuxpowertop.org/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: powertop-1.1-build-fixes.patch
-
-#BuildRequires:  
-#Requires:       
+Patch0: powertop-1.2-install-man-page.patch
 
 %description
 PowerTOP is a tool that finds the software component(s) that make your
 computer use more power than necessary while it is idle.
 
 %prep
-%setup -q -n %{name}
-%patch -p1 -b .build-fixes
+%setup -q
+%patch0 -p1 -b .install-man-page
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -37,8 +34,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/powertop
+%{_mandir}/man1/powertop.1*
 
 %changelog
+* Tue May 15 2007 Adam Jackson <ajax@redhat.com> 1.2-1
+- powertop 1.2.  Fixes power reports on machines that report power in Amperes
+  instead of Watts.
+
 * Sun May 13 2007 Adam Jackson <ajax@redhat.com> 1.1-1
 - powertop 1.1.
 
diff --git a/sources b/sources
index 2eaf8c3..ea06d9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4420482fff4c3f0c63a4a3cec56f2931  powertop-1.1.tar.gz
+fa18e6115e75417bf94ca38021f8959d  powertop-1.2.tar.gz