From 824f0d30abe912647271ad6e5a80944cad378a7ff31f8fb3ad08e46a7db09b95 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Tue, 26 Jan 2016 17:30:49 +0000
Subject: [PATCH] - Move from kernel version to turbostat internal version for
 turbostat - Add latest turbostat sources (latest git commit: 30f05309bde492)
 - Adds Skylake, Broadwell and Knights Landing support for turbostat  
 (fate#319798, fate#319183, fate#319516)

OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=55
---
 cpupower.changes                             |  8 ++++++++
 cpupower.spec                                |  4 ++--
 make_header_file_passable_from_outside.patch | 10 +++++-----
 turbostat-3.19.tar.bz2                       |  3 ---
 turbostat-4.8.tar.bz2                        |  3 +++
 turbostat_fix_man_perm.patch                 |  8 ++++----
 6 files changed, 22 insertions(+), 14 deletions(-)
 delete mode 100644 turbostat-3.19.tar.bz2
 create mode 100644 turbostat-4.8.tar.bz2

diff --git a/cpupower.changes b/cpupower.changes
index b374127..8faa62f 100644
--- a/cpupower.changes
+++ b/cpupower.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan 26 17:29:27 UTC 2016 - trenn@suse.de
+
+- Move from kernel version to turbostat internal version for turbostat
+- Add latest turbostat sources (latest git commit: 30f05309bde492)
+- Adds Skylake, Broadwell and Knights Landing support for turbostat
+  (fate#319798, fate#319183, fate#319516)
+
 -------------------------------------------------------------------
 Wed Jan  6 10:22:14 UTC 2016 - jdelvare@suse.com
 
diff --git a/cpupower.spec b/cpupower.spec
index c21ca79..a09c07c 100644
--- a/cpupower.spec
+++ b/cpupower.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cpupower
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Author: Thomas Renninger <trenn@suse.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,7 +22,7 @@ Name:           cpupower
 %define version %(rpm -q --qf '%{VERSION}' kernel-source)
 Version:        3.19
 Release:        0
-%define tsversion      3.19
+%define tsversion      4.8
 Summary:        Tools to determine and set CPU Power related Settings
 License:        GPL-2.0
 Group:          System/Base
diff --git a/make_header_file_passable_from_outside.patch b/make_header_file_passable_from_outside.patch
index c396d9f..7b2d30a 100644
--- a/make_header_file_passable_from_outside.patch
+++ b/make_header_file_passable_from_outside.patch
@@ -1,12 +1,12 @@
-Index: turbostat-3.14/Makefile
+Index: turbostat-4.8/Makefile
 ===================================================================
---- turbostat-3.14.orig/Makefile
-+++ turbostat-3.14/Makefile
-@@ -5,7 +5,6 @@ DESTDIR		:=
+--- turbostat-4.8.orig/Makefile	2016-01-26 18:26:10.350954918 +0100
++++ turbostat-4.8/Makefile	2016-01-26 18:26:40.512676659 +0100
+@@ -9,7 +9,6 @@ endif
  
  turbostat : turbostat.c
  CFLAGS +=	-Wall
--CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"'
+-CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
  
  %: %.c
  	@mkdir -p $(BUILD_OUTPUT)
diff --git a/turbostat-3.19.tar.bz2 b/turbostat-3.19.tar.bz2
deleted file mode 100644
index fbdb985..0000000
--- a/turbostat-3.19.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13609c4d8776f9c7dbea10a5cfe46471762b4631a67722d8f1aabcff8658f163
-size 17070
diff --git a/turbostat-4.8.tar.bz2 b/turbostat-4.8.tar.bz2
new file mode 100644
index 0000000..de20810
--- /dev/null
+++ b/turbostat-4.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:115427a60ddad420d5399ef99062c1d2065cfe7896e3e6b14461e18faeaf6335
+size 27108
diff --git a/turbostat_fix_man_perm.patch b/turbostat_fix_man_perm.patch
index 6956980..468f924 100644
--- a/turbostat_fix_man_perm.patch
+++ b/turbostat_fix_man_perm.patch
@@ -1,8 +1,8 @@
-Index: turbostat-3.13/Makefile
+Index: turbostat-4.8/Makefile
 ===================================================================
---- turbostat-3.13.orig/Makefile
-+++ turbostat-3.13/Makefile
-@@ -19,4 +19,4 @@ install : turbostat
+--- turbostat-4.8.orig/Makefile	2016-01-21 12:41:36.053333345 +0100
++++ turbostat-4.8/Makefile	2016-01-26 18:25:57.334212372 +0100
+@@ -23,4 +23,4 @@ install : turbostat
  	install -d  $(DESTDIR)$(PREFIX)/bin
  	install $(BUILD_OUTPUT)/turbostat $(DESTDIR)$(PREFIX)/bin/turbostat
  	install -d  $(DESTDIR)$(PREFIX)/share/man/man8