Accepting request 147562 from Base:System

update to 2.2 for openSuSE 12.3, acked by coolo
http://lists.opensuse.org/opensuse-factory/2013-01/msg00086.html

OBS-URL: https://build.opensuse.org/request/show/147562
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/powertop?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2013-01-10 12:52:58 +00:00 committed by Git OBS Bridge
commit b043d06df1
6 changed files with 95 additions and 4 deletions

View File

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

View File

@ -0,0 +1,41 @@
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

View File

@ -0,0 +1,34 @@
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 Normal file
View File

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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Jan 1 16:00:00 UTC 2013 - remur@gmx.net
- Update to version 2.2:
* Bugfixes
* Translation updates
* Interactive mode scrolling
* Tunables: suggest writing min_power to all SATA ports
- powertop-2.2-version-fix.patch: Fixes displayed version string in ncurses interface
- powertop-2.2-fix-crash-on-readonly-fs.patch: Fixes crash when writing report to RO filesystem
-------------------------------------------------------------------
Thu Aug 30 16:02:03 UTC 2012 - chenxiaolong@cxl.epac.to

View File

@ -22,11 +22,14 @@ 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.1
Version: 2.2
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
@ -47,6 +50,8 @@ 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