rpms/powertop/devel .cvsignore, 1.8, 1.9 powertop-1.7-less-gpm-slander-plz.patch, 1.1, 1.2 powertop-1.7-strncpy.patch, 1.1, 1.2 powertop.spec, 1.11, 1.12 sources, 1.8, 1.9 powertop-1.7-dump.patch, 1.1, NONE
Joshua W. Boyer (jwboyer)
fedora-extras-commits at redhat.com
Tue Aug 21 12:21:38 UTC 2007
Author: jwboyer
Update of /cvs/pkgs/rpms/powertop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32220
Modified Files:
.cvsignore powertop-1.7-less-gpm-slander-plz.patch
powertop-1.7-strncpy.patch powertop.spec sources
Removed Files:
powertop-1.7-dump.patch
Log Message:
Update to powertop 1.8. Drop upstreamed dump patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powertop/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 18 Jun 2007 14:54:32 -0000 1.8
+++ .cvsignore 21 Aug 2007 12:21:04 -0000 1.9
@@ -1 +1 @@
-powertop-1.7.tar.gz
+powertop-1.8.tar.gz
powertop-1.7-less-gpm-slander-plz.patch:
Index: powertop-1.7-less-gpm-slander-plz.patch
===================================================================
RCS file: /cvs/pkgs/rpms/powertop/devel/powertop-1.7-less-gpm-slander-plz.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- powertop-1.7-less-gpm-slander-plz.patch 5 Jul 2007 20:32:24 -0000 1.1
+++ powertop-1.7-less-gpm-slander-plz.patch 21 Aug 2007 12:21:04 -0000 1.2
@@ -1,15 +1,18 @@
-diff -up powertop-1.7/powertop.c.jx powertop-1.7/powertop.c
---- powertop-1.7/powertop.c.jx 2007-06-17 21:16:31.000000000 -0400
-+++ powertop-1.7/powertop.c 2007-07-05 16:07:16.000000000 -0400
-@@ -631,12 +631,6 @@ int main(int argc, char **argv)
+---
+ powertop.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+--- powertop-1.8.orig/powertop.c
++++ powertop-1.8/powertop.c
+@@ -700,12 +700,6 @@ int main(int argc, char **argv)
"Beagle is the program that indexes for easy desktop search, however it's \n"
"not very efficient and costs a significant amount of battery life."), 30);
-- /* suggest to stop gnome-power-manager if it shows up in the top 10 and wakes up more than 10 times in the measurement */
+- /* suggest to stop gnome-power-manager only if it shows up in the top 10 and wakes up more than 10 times in the measurement */
- suggest_process_death("gnome-power-man : schedule_timeout (process_timeout)", "gnome-power-manager", lines, min(linehead,10), 10.0,
- _("Suggestion: Disable or remove 'gnome-power-manager' from your system. \n"
-- "Despite its name, some versions of gnome-power-manager end up costing more power \n"
-- "than it'll ever save."), 5);
+- "Older versions of gnome-power-manager wake up far more often than \n"
+- "needed costing you some power."), 5);
-
/* suggest to stop pcscd if it shows up in the top 50 and wakes up at all*/
suggest_process_death("pcscd : ", "pcscd", lines, min(linehead,50), 1.0,
powertop-1.7-strncpy.patch:
Index: powertop-1.7-strncpy.patch
===================================================================
RCS file: /cvs/pkgs/rpms/powertop/devel/powertop-1.7-strncpy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- powertop-1.7-strncpy.patch 9 Jul 2007 18:00:30 -0000 1.1
+++ powertop-1.7-strncpy.patch 21 Aug 2007 12:21:04 -0000 1.2
@@ -1,16 +1,21 @@
-diff -u powertop-1.7.orig/display.c powertop-1.7/display.c
---- powertop-1.7.orig/display.c 2007-06-18 03:16:33.000000000 +0200
-+++ powertop-1.7/display.c 2007-07-05 02:43:51.000000000 +0200
-@@ -44,7 +44,7 @@
- static WINDOW *status_bar_window;
+---
+ display.c | 8 ++++----
+ powertop.h | 5 ++++-
+ suggestions.c | 4 ++--
+ 3 files changed, 10 insertions(+), 7 deletions(-)
+
+--- powertop-1.8.orig/display.c
++++ powertop-1.8/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)
-char status_bar_slots[10][40];
+char status_bar_slots[STATUS_BAR_NR_SLOTS][STATUS_BAR_SLOTSIZE + 1];
static void cleanup_curses(void) {
endwin();
-@@ -104,8 +104,8 @@
+@@ -105,8 +105,8 @@ void setup_windows(void)
suggestion_window = subwin(stdscr, 3, maxx, maxy-4, 0);
status_bar_window = subwin(stdscr, 1, maxx, maxy-1, 0);
@@ -21,7 +26,7 @@
werase(stdscr);
refresh();
-@@ -148,7 +148,7 @@
+@@ -150,7 +150,7 @@ void show_title_bar(void)
werase(status_bar_window);
x = 0;
@@ -30,49 +35,37 @@
if (strlen(status_bar_slots[i])==0)
continue;
wattron(status_bar_window, A_REVERSE);
-Gemeinsame Unterverzeichnisse: powertop-1.7.orig/po und powertop-1.7/po.
-diff -u powertop-1.7.orig/powertop.h powertop-1.7/powertop.h
---- powertop-1.7.orig/powertop.h 2007-06-17 08:21:37.000000000 +0200
-+++ powertop-1.7/powertop.h 2007-07-05 02:39:53.000000000 +0200
-@@ -64,7 +64,10 @@
- extern int topcstate;
+--- powertop-1.8.orig/powertop.h
++++ powertop-1.8/powertop.h
+@@ -69,7 +69,10 @@ extern int topcstate;
extern int topfreq;
+ extern int dump;
-extern char status_bar_slots[10][40];
+#define STATUS_BAR_NR_SLOTS 10
-+#define STATUS_BAR_SLOTSIZE 40
++#define STATUS_BAR_SLOTSIZE 40
+char status_bar_slots[STATUS_BAR_NR_SLOTS][STATUS_BAR_SLOTSIZE + 1];
+
extern char suggestion_key;
extern suggestion_func *suggestion_activate;
-diff -u powertop-1.7.orig/suggestions.c powertop-1.7/suggestions.c
---- powertop-1.7.orig/suggestions.c 2007-06-08 07:33:13.000000000 +0200
-+++ powertop-1.7/suggestions.c 2007-07-05 02:42:59.000000000 +0200
-@@ -70,7 +70,7 @@
+--- powertop-1.8.orig/suggestions.c
++++ powertop-1.8/suggestions.c
+@@ -71,7 +71,7 @@ void reset_suggestions(void)
ptr = next;
}
suggestions = NULL;
-- strcpy(status_bar_slots[9],"");
-+ strncpy(status_bar_slots[9], "", STATUS_BAR_SLOTSIZE);
+- strcpy(status_bar_slots[8],"");
++ strncpy(status_bar_slots[8],"", STATUS_BAR_SLOTSIZE);
suggestion_key = 255;
suggestion_activate = NULL;
total_weight = 0;
-@@ -103,7 +103,7 @@
- int value, running = 0;
+@@ -105,7 +105,7 @@ void pick_suggestion(void)
struct suggestion *ptr;
+ int weight;
-- strcpy(status_bar_slots[9],"");
-+ strncpy(status_bar_slots[9], "", STATUS_BAR_SLOTSIZE);
+- strcpy(status_bar_slots[8],"");
++ strncpy(status_bar_slots[8],"", STATUS_BAR_SLOTSIZE);
suggestion_key = 255;
suggestion_activate = NULL;
-@@ -119,7 +119,7 @@
- running += ptr->weight;
- if (running > value) {
- if (ptr->keystring)
-- strcpy(status_bar_slots[9],ptr->keystring);
-+ strncpy(status_bar_slots[9], ptr->keystring, STATUS_BAR_SLOTSIZE);
- suggestion_key = ptr->key;
- suggestion_activate = ptr->func;
- show_suggestion(ptr->string);
Index: powertop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powertop/devel/powertop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- powertop.spec 23 Jul 2007 15:21:33 -0000 1.11
+++ powertop.spec 21 Aug 2007 12:21:04 -0000 1.12
@@ -1,6 +1,6 @@
Name: powertop
-Version: 1.7
-Release: 4%{?dist}
+Version: 1.8
+Release: 1%{?dist}
Summary: Power consumption monitor
Group: Applications/System
@@ -14,7 +14,6 @@
Patch0: powertop-1.7-less-gpm-slander-plz.patch
Patch1: powertop-1.7-strncpy.patch
-Patch2: powertop-1.7-dump.patch
%description
PowerTOP is a tool that finds the software component(s) that make your
@@ -24,9 +23,6 @@
%setup -q
%patch0 -p1 -b .g-p-m
%patch1 -p1 -b .strncpy
-# Allow dumping to stdout. Warning: watch for new mvwprintw statements
-# when rebasing!
-%patch2 -p1 -b .dump
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -47,6 +43,9 @@
%{_mandir}/man1/powertop.1*
%changelog
+* Mon Aug 20 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.8-1
+- Update to latest release
+
* Mon Jul 23 2007 Bill Nottingham <notting at redhat.com> 1.7-4
- add patch to allow dumping output to stdout
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powertop/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 18 Jun 2007 14:54:32 -0000 1.8
+++ sources 21 Aug 2007 12:21:04 -0000 1.9
@@ -1 +1 @@
-84c012fe5e866b5deb588606a6b9822b powertop-1.7.tar.gz
+38fd8a6825cd62b6c22df8a44b4e27d0 powertop-1.8.tar.gz
--- powertop-1.7-dump.patch DELETED ---
More information about the fedora-extras-commits
mailing list