From a6d211a726ae688dc38594990198d13839755d0a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 14 May 2007 01:55:56 +0000 Subject: [PATCH] - powertop 1.1. --- .cvsignore | 2 +- powertop-1.0-makefile-fixes.patch | 21 --------------------- powertop-1.1-build-fixes.patch | 21 +++++++++++++++++++++ powertop.spec | 9 ++++++--- sources | 2 +- 5 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 powertop-1.0-makefile-fixes.patch create mode 100644 powertop-1.1-build-fixes.patch diff --git a/.cvsignore b/.cvsignore index 169a8e4..a9f0312 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -powertop-1.0.tar.gz +powertop-1.1.tar.gz diff --git a/powertop-1.0-makefile-fixes.patch b/powertop-1.0-makefile-fixes.patch deleted file mode 100644 index 71679b3..0000000 --- a/powertop-1.0-makefile-fixes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- powertop/Makefile.destdir 2007-05-11 15:27:34.000000000 -0400 -+++ powertop/Makefile 2007-05-11 20:04:46.000000000 -0400 -@@ -1,11 +1,14 @@ - BINDIR=/usr/bin - -+CFLAGS ?= -Wall -W -O1 -g -+ - powertop: powertop.c config.c Makefile -- gcc -Wall -W -O1 -g powertop.c config.c -o powertop -+ gcc $(CFLAGS) powertop.c config.c -o powertop - - install: powertop -- cp powertop ${BINDIR} -+ mkdir -p ${DESTDIR}${BINDIR} -+ cp powertop ${DESTDIR}${BINDIR} - - clean: - rm -f *~ powertop -- -\ No newline at end of file -+ diff --git a/powertop-1.1-build-fixes.patch b/powertop-1.1-build-fixes.patch new file mode 100644 index 0000000..0635afd --- /dev/null +++ b/powertop-1.1-build-fixes.patch @@ -0,0 +1,21 @@ +--- 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.spec b/powertop.spec index 9b03b0f..367b712 100644 --- a/powertop.spec +++ b/powertop.spec @@ -1,5 +1,5 @@ Name: powertop -Version: 1.0 +Version: 1.1 Release: 1%{?dist} Summary: Power consumption monitor @@ -9,7 +9,7 @@ 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.0-makefile-fixes.patch +Patch0: powertop-1.1-build-fixes.patch #BuildRequires: #Requires: @@ -35,9 +35,12 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING +%doc COPYING README %{_bindir}/powertop %changelog +* Sun May 13 2007 Adam Jackson 1.1-1 +- powertop 1.1. + * Fri May 11 2007 Adam Jackson 1.0-1 - Initial revision. diff --git a/sources b/sources index 13d0c98..2eaf8c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2f64f27cc3f6cb90fa40c2c40c025e5 powertop-1.0.tar.gz +4420482fff4c3f0c63a4a3cec56f2931 powertop-1.1.tar.gz