Accepting request 178320 from hardware

- Fix spec to avoid conflict with cpufrequtils-devel (forwarded request 177085 from varkoly)

OBS-URL: https://build.opensuse.org/request/show/178320
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cpupower?expand=0&rev=13

cpupower-3.7.tar.bz2

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

cpupower-3.8.tar.bz2

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

cpupower-haswell_support.patch

@@ -0,0 +1,14 @@
+Index: cpupower-3.8/utils/idle_monitor/snb_idle.c
+===================================================================
+--- cpupower-3.8.orig/utils/idle_monitor/snb_idle.c
++++ cpupower-3.8/utils/idle_monitor/snb_idle.c
+@@ -155,6 +155,9 @@ static struct cpuidle_monitor *snb_regis
+ 	case 0x2D: /* SNB Xeon */
+ 	case 0x3A: /* IVB */
+ 	case 0x3E: /* IVB Xeon */
++	case 0x3C: /* HSW */
++	case 0x3F: /* HSW */
++	case 0x45: /* HSW */
+ 		break;
+ 	default:
+ 		return NULL;

cpupower.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri May 31 15:57:02 UTC 2013 - varkoly@suse.com
+
+- Fix spec to avoid conflict with cpufrequtils-devel
+
+-------------------------------------------------------------------
+Wed Feb 13 14:57:44 UTC 2013 - trenn@suse.de
+
+- Add Haswell support
+
 -------------------------------------------------------------------
 Wed Jan 23 10:49:30 UTC 2013 - trenn@suse.de
 

cpupower.spec

@@ -17,18 +17,18 @@
 #
 
 
-
 Name:           cpupower
 Url:            http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
 # Use this as version when things are in mainline kernel
 %define version %(rpm -q --qf '%{VERSION}' kernel-source)
-Version:        3.7
+Version:        3.8
 Release:        0
 Summary:        Tools to determine and set CPU Power related Settings
 License:        GPL-2.0
 Group:          System/Base
 Source:         %{name}-%{version}.tar.bz2
 Source1:        cpupower_export_tarball_from_git.sh
+Patch1:         cpupower-haswell_support.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gettext-tools
 BuildRequires:  pciutils
@@ -52,6 +52,7 @@ C libraries.
 %package devel
 Summary:        Include files and C-libraries
 Group:          Development/Languages/C and C++
+Conflicts:      cpufrequtils-devel
 Requires:       libcpupower0 = %{version}
 
 %description devel
@@ -72,6 +73,7 @@ powersave module.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.