Accepting request 897864 from home:dirkmueller:Factory

- update to 2.14:
  * add service file
  * remove stale printf line
  * Enable Rocket Lake platform support
  * Enable Alder Lake support
- remove powertop-add-rocket-lake-support.patch (upstream)

OBS-URL: https://build.opensuse.org/request/show/897864
OBS-URL: https://build.opensuse.org/package/show/Base:System/powertop?expand=0&rev=72

powertop-add-rocket-lake-support.patch

@@ -1,47 +0,0 @@
-From 8e2fd311778b990240847e3e9ce3840ff312f5a7 Mon Sep 17 00:00:00 2001
-From: Gayatri Kammela <gayatri.kammela@intel.com>
-Date: Thu, 29 Oct 2020 12:09:06 -0700
-Subject: [PATCH] intel_cpus: Enable Rocket Lake desktop platform support in
- PowerTop
-
-Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
----
- src/cpu/intel_cpus.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp
-index 13923b2..3d4464c 100644
---- a/src/cpu/intel_cpus.cpp
-+++ b/src/cpu/intel_cpus.cpp
-@@ -83,6 +83,7 @@ static int intel_cpu_models[] = {
- 	0x9E,	/* KBL */
- 	0xA5,   /* CML_DESKTOP */
- 	0xA6,   /* CML_MOBILE */
-+	0xA7,	/* RKL_DESKTOP */
- 	0	/* last entry must be zero */
- };
- 
-@@ -196,6 +197,7 @@ nhm_core::nhm_core(int model)
- 		case 0x9E:	/* KBL */
- 		case 0xA5:      /* CML_DESKTOP */
- 		case 0xA6:      /* CML_MOBILE */
-+		case 0xA7:	/* RKL_DESKTOP */
- 			has_c7_res = 1;
- 	}
- 
-@@ -385,6 +387,7 @@ nhm_package::nhm_package(int model)
- 		case 0x9E:	/* KBL */
- 		case 0xA5:      /* CML_DESKTOP */
- 		case 0xA6:      /* CML_MOBILE */
-+		case 0xA7:	/* RKL_DESKTOP */
- 			has_c2c6_res=1;
- 			has_c7_res = 1;
- 	}
-@@ -428,6 +431,7 @@ nhm_package::nhm_package(int model)
- 		case 0x9E:	/* KBL */
- 		case 0xA5:      /* CML_DESKTOP */
- 		case 0xA6:      /* CML_MOBILE */
-+		case 0xA7:	/* RKL_DESKTOP */
- 			has_c8c9c10_res = 1;
- 			break;
- 	}

powertop.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Jun  6 13:14:31 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.14:
+  * add service file
+  * remove stale printf line
+  * Enable Rocket Lake platform support
+  * Enable Alder Lake support
+- remove powertop-add-rocket-lake-support.patch (upstream)
+
 -------------------------------------------------------------------
 Wed Nov 11 08:25:09 UTC 2020 - Michael Vetter <mvetter@suse.com>
 

powertop.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package powertop
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,14 @@
 
 
 Name:           powertop
-Version:        2.13
+Version:        2.14
 Release:        0
 Summary:        A Linux Tool to Find out What is Using Power on a Laptop
 License:        GPL-2.0-only
 Group:          System/Monitoring
 URL:            https://01.org/powertop/
-Source0:        https://github.com/fenrus75/powertop/archive/v2.13.tar.gz
+Source0:        https://github.com/fenrus75/powertop/archive/v%{version}.tar.gz
 Source1:        powertop.service
-# jsc#SLE-13395: Add powertop support
-Patch0:         powertop-add-rocket-lake-support.patch
 # they repeatedly forget to upload a release tarball and only have the one from
 # GitHub which doesnt contain configure thus adding:
 # autoconf, autoconf-archive, automake, libtool
@@ -54,7 +52,6 @@ doing in terms of power savings.
 
 %prep
 %setup -q -n powertop-%{version}
-%patch0 -p1
 
 # Delete objects files left in tarball
 find . -name '*.o' -delete
@@ -63,8 +60,8 @@ find . -name '*.o' -delete
 # workaround for 'error: too many loops' in sle15sp3
 # also see rhbz#1826935
 autoreconf -fi || autoreconf -fi
-export CFLAGS="%{optflags} -D_GNU_SOURCE"
-%configure
+export CFLAGS="%{optflags} -D_GNU_SOURCE -pthread"
+%configure --disable-static
 %make_build
 
 %install

v2.13.tar.gz

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

v2.14.tar.gz

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