From d6e67a5eab602ad568d691625a7c9462ca015add2f5692d1585b4a45a4024d13 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Wed, 13 Feb 2013 14:58:02 +0000
Subject: [PATCH 1/2] - Add Haswell support

OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=23
---
 cpupower-3.7.tar.bz2           |  3 ---
 cpupower-3.8.tar.bz2           |  3 +++
 cpupower-haswell_support.patch | 14 ++++++++++++++
 cpupower.changes               |  5 +++++
 cpupower.spec                  |  4 +++-
 5 files changed, 25 insertions(+), 4 deletions(-)
 delete mode 100644 cpupower-3.7.tar.bz2
 create mode 100644 cpupower-3.8.tar.bz2
 create mode 100644 cpupower-haswell_support.patch

diff --git a/cpupower-3.7.tar.bz2 b/cpupower-3.7.tar.bz2
deleted file mode 100644
index a490734..0000000
--- a/cpupower-3.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f7a05b0026ff6ca37400f8c2dc1e282b6d26439bdca087fa11885f18cc0edec
-size 68302
diff --git a/cpupower-3.8.tar.bz2 b/cpupower-3.8.tar.bz2
new file mode 100644
index 0000000..fcbaf5a
--- /dev/null
+++ b/cpupower-3.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e790e3e6f8bf3e3b9c444a59277300cd8e6e7804268567834e9e7be412f01e0
+size 68590
diff --git a/cpupower-haswell_support.patch b/cpupower-haswell_support.patch
new file mode 100644
index 0000000..67fd54f
--- /dev/null
+++ b/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;
diff --git a/cpupower.changes b/cpupower.changes
index c4eab52..b067464 100644
--- a/cpupower.changes
+++ b/cpupower.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
 
diff --git a/cpupower.spec b/cpupower.spec
index 0b2a3f3..5179b6b 100644
--- a/cpupower.spec
+++ b/cpupower.spec
@@ -22,13 +22,14 @@ 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
@@ -72,6 +73,7 @@ powersave module.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.

From 8c3f6923ab16d41fc8504703b7cb63dd42be09c1d44575ab2b8dd649c35ef286 Mon Sep 17 00:00:00 2001
From: "Michal Hrusecky (old before rename to _miska_)"
 <michal.hrusecky@opensuse.org>
Date: Mon, 10 Jun 2013 10:42:16 +0000
Subject: [PATCH 2/2] Accepting request 177085 from
 home:varkoly:branches:hardware

- Fix spec to avoid conflict with cpufrequtils-devel

OBS-URL: https://build.opensuse.org/request/show/177085
OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=24
---
 cpupower.changes | 5 +++++
 cpupower.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cpupower.changes b/cpupower.changes
index b067464..6223583 100644
--- a/cpupower.changes
+++ b/cpupower.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
 
diff --git a/cpupower.spec b/cpupower.spec
index 5179b6b..5ebe9da 100644
--- a/cpupower.spec
+++ b/cpupower.spec
@@ -17,7 +17,6 @@
 #
 
 
-
 Name:           cpupower
 Url:            http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
 # Use this as version when things are in mainline kernel
@@ -53,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