rpm/powertop
SHA256
1
0
Fork 0
forked from pool/powertop
Code Pull Requests Activity

Accepting request 175781 from home:remur:branches:Base:System

Browse Source 
version update to 2.3, tested opensuse 12.3 build, looks good

OBS-URL: https://build.opensuse.org/request/show/175781
OBS-URL: https://build.opensuse.org/package/show/Base:System/powertop?expand=0&rev=18
This commit is contained in:
Marcus Meissner 2013-05-16 13:13:58 +00:00 committed by Git OBS Bridge
parent ccc6279728
commit e37c286934
6 changed files with 13 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
powertop-2.2-fix-crash-on-readonly-fs.patch
View File

@ -1,41 +0,0 @@
From bd72b4433fec358801afebf3f02ab899b1745c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Wed, 28 Nov 2012 16:31:38 +0100
Subject: [PATCH] report: fixed crash when writing report to RO filesystem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
---
src/report/report.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/report/report.cpp b/src/report/report.cpp
index 51bc6a7..c018bb1 100644
--- a/src/report/report.cpp
+++ b/src/report/report.cpp
@@ -183,13 +183,16 @@ void init_report_output(char *filename_str, int iterations)
void finish_report_output(void)
{
- fprintf(stderr, _("PowerTOP outputing using base filename %s\n"), reportout.filename);
if (reporttype == REPORT_OFF)
return;
report.finish_report();
- fputs(report.get_result(), reportout.report_file);
- fdatasync(fileno(reportout.report_file));
- fclose(reportout.report_file);
+ if (reportout.report_file)
+ {
+ fprintf(stderr, _("PowerTOP outputing using base filename %s\n"), reportout.filename);
+ fputs(report.get_result(), reportout.report_file);
+ fdatasync(fileno(reportout.report_file));
+ fclose(reportout.report_file);
+ }
report.clear_result();
}
--
1.7.11.7

34
powertop-2.2-version-fix.patch
View File

@ -1,34 +0,0 @@
From: Namhyung Kim <namhyung@gmail.com>
To: powertop@lists.01.org
Date: Sun, 18 Nov 2012 00:42:47 +0900
Message-Id: <1353166967-24095-1-git-send-email-namhyung@gmail.com>
Subject: [Powertop] [PATCH] Use PACKAGE_VERSION for POWERTOP_VERSION
It was missed to update POWERTOP_VERSION macro so that the
new v2.2 release still shows v2.1 string on the header of
ncurses window. Convert to use PACKAGE_VERSION macro which
set by autotools to the AC_INIT version so that it cannot
be missed anymore.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
src/lib.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib.h b/src/lib.h
index 8cf4632..209421a 100644
--- a/src/lib.h
+++ b/src/lib.h
@@ -35,8 +35,8 @@
#define _(STRING) gettext(STRING)
-#define POWERTOP_VERSION "v2.1"
-#define POWERTOP_SHORT_VERSION "2.1"
+#define POWERTOP_VERSION "v"PACKAGE_VERSION
+#define POWERTOP_SHORT_VERSION PACKAGE_VERSION
extern int get_max_cpu(void);
--
1.7.9.2

3
powertop-2.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1339e1bc3b9675c71dd70fed1132abf215d01469b348d23be7344bc65557b028
size 617805

3
powertop-2.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744
size 625004

8
powertop.changes
View File

@ -1,4 +1,12 @@
-------------------------------------------------------------------
Wed May 15 17:41:07 UTC 2013 - remur@gmx.net
- Update to version 2.3
* Maintenance release
- dropped: powertop-2.2-version-fix.patch
- dropped: powertop-2.2-fix-crash-on-readonly-fs.patch
-------------------------------------------------------------------
Thu Jan 1 16:00:00 UTC 2013 - remur@gmx.net
- Update to version 2.2:

9
powertop.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package powertop
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,14 +22,11 @@ Url: https://01.org/powertop/
Summary: A Linux Tool to Find out What is Using Power on a Laptop
License: GPL-2.0+
Group: System/Monitoring
Version: 2.2
Version: 2.3
Release: 0
Source: https://01.org/powertop/sites/default/files/downloads/%name-%version.tar.gz
Patch2: powertop-1.98-always-create-params.patch
Patch5: powertop-no-date.patch
# Following patches were found by the mindful fedora maintainer
Patch6: powertop-2.2-version-fix.patch
Patch7: powertop-2.2-fix-crash-on-readonly-fs.patch
BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: ncurses-devel
@ -50,8 +47,6 @@ doing in terms of power savings.
%setup -q
%patch2 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
# Delete objects files left in tarball
find . -name '*.o' -delete