Accepting request 358587 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/358587
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/powertop?expand=0&rev=41

powertop-1.98-always-create-params.patch

@@ -1,40 +0,0 @@
----
- src/parameters/persistent.cpp |   18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-Index: powertop-2.0/src/parameters/persistent.cpp
-===================================================================
---- powertop-2.0.orig/src/parameters/persistent.cpp
-+++ powertop-2.0/src/parameters/persistent.cpp
-@@ -129,9 +129,6 @@ void save_parameters(const char *filenam
- 
- //	printf("result size is %i, #parameters is %i \n", (int)past_results.size(), (int)all_parameters.parameters.size());
- 
--	if (!global_power_valid())
--		return;
--
- 	pathname = get_param_directory(filename);
- 
- 	file.open(pathname, ios::out);
-@@ -140,12 +137,15 @@ void save_parameters(const char *filenam
- 		return;
- 	}
- 
--	map<string, int>::iterator it;
--
--	for (it = param_index.begin(); it != param_index.end(); it++) {
--		int index;
--		index = it->second;
--		file << it->first << "\t" << setprecision(9) << all_parameters.parameters[index] << "\n";
-+	if (global_power_valid())
-+	{
-+		map<string, int>::iterator it;
-+
-+		for (it = param_index.begin(); it != param_index.end(); it++) {
-+			int index;
-+			index = it->second;
-+			file << it->first << "\t" << setprecision(9) << all_parameters.parameters[index] << "\n";
-+		}
- 	}
- 	file.close();
- }

powertop.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Feb  8 14:44:26 UTC 2016 - mvetter@suse.com
+
+- Remove patch powertop-1.98-always-create-params.patch:
+  * No mention why this is needed. I don't see any reason for
+    having it.
+
+-------------------------------------------------------------------
+Thu Feb  4 10:09:28 UTC 2016 - mpluskal@suse.com
+
+- Make building more verbose
+- Use optflags when building
+
 -------------------------------------------------------------------
 Tue Nov 10 01:46:48 UTC 2015 - p.drouand@gmail.com
 

powertop.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package powertop
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,6 @@ Group:          System/Monitoring
 Url:            https://01.org/powertop/
 Source0:        https://01.org/sites/default/files/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1:        powertop.service
-Patch2:         powertop-1.98-always-create-params.patch
 Patch5:         powertop-no-date.patch
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
@@ -51,22 +50,21 @@ doing in terms of power savings.
 
 %prep
 %setup -q
-%patch2 -p1
 %patch5 -p1
 
 # Delete objects files left in tarball
 find . -name '*.o' -delete
 
 %build
-%configure CFLAGS=-D_GNU_SOURCE
+export CFLAGS="%{optflags} -D_GNU_SOURCE"
-make %{?_smp_mflags}
+%configure
+make %{?_smp_mflags} V=1
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 install -Dd %{buildroot}%{_localstatedir}/cache/powertop
 touch %{buildroot}%{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results.powertop}
-install -d %{buildroot}%{_unitdir}
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/powertop.service
-install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %find_lang %{name}