- Update to latest release

- Drop upstreamed patch
This commit is contained in:
jwboyer 2008-11-06 12:53:59 +00:00
parent 0013c9af8c
commit ee8319d9cf
4 changed files with 17 additions and 15 deletions

View File

@ -1 +1 @@
powertop-1.9.tar.gz
powertop-1.10.tar.gz

View File

@ -4,8 +4,8 @@
suggestions.c | 4 ++--
3 files changed, 10 insertions(+), 7 deletions(-)
--- powertop-1.8.orig/display.c
+++ powertop-1.8/display.c
--- powertop-1.10.orig/display.c
+++ powertop-1.10/display.c
@@ -45,7 +45,7 @@ static WINDOW *status_bar_window;
#define print(win, y, x, fmt, args...) do { if (dump) printf(fmt, ## args); else mvwprintw(win, y, x, fmt, ## args); } while (0)
@ -35,11 +35,11 @@
if (strlen(status_bar_slots[i])==0)
continue;
wattron(status_bar_window, A_REVERSE);
--- powertop-1.8.orig/powertop.h
+++ powertop-1.8/powertop.h
@@ -69,7 +69,10 @@ extern int topcstate;
extern int topfreq;
extern int dump;
--- powertop-1.10.orig/powertop.h
+++ powertop-1.10/powertop.h
@@ -73,7 +73,10 @@ extern int dump;
extern int showpids;
-extern char status_bar_slots[10][40];
+#define STATUS_BAR_NR_SLOTS 10
@ -49,8 +49,8 @@
extern char suggestion_key;
extern suggestion_func *suggestion_activate;
--- powertop-1.8.orig/suggestions.c
+++ powertop-1.8/suggestions.c
--- powertop-1.10.orig/suggestions.c
+++ powertop-1.10/suggestions.c
@@ -71,7 +71,7 @@ void reset_suggestions(void)
ptr = next;
}

View File

@ -1,6 +1,6 @@
Name: powertop
Version: 1.9
Release: 4%{?dist}
Version: 1.10
Release: 1%{?dist}
Summary: Power consumption monitor
Group: Applications/System
@ -13,7 +13,6 @@ BuildRequires: gettext
BuildRequires: ncurses-devel
Patch1: powertop-1.7-strncpy.patch
Patch2: powertop-1.9-hciconfig.patch
%description
PowerTOP is a tool that finds the software component(s) that make your
@ -22,7 +21,6 @@ computer use more power than necessary while it is idle.
%prep
%setup -q
%patch1 -p1 -b .strncpy
%patch2 -p1 -b .hciconfig
%build
export CFLAGS="$RPM_OPT_FLAGS"
@ -43,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/powertop.1*
%changelog
* Thu Nov 6 2008 Josh Boyer <jwboyer@gmail.com> - 1.10-1
- Update to latest release
- Drop upstreamed patch
* Wed May 21 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.9-4
- fix license tag

View File

@ -1 +1 @@
7e2cd799941350a45586edac43760ac9 powertop-1.9.tar.gz
e09f631f60d50299d8885193e6fd3756 powertop-1.10.tar.gz