From 061438bcfb805fd808aaac7ff7199240295887a7a3f9933568b73b508ee89a6d Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Wed, 5 Jun 2019 13:42:34 +0000
Subject: [PATCH] Accepting request 707851 from home:trenn:branches:hardware

- Update to kernel version 5.1 final
- Remove very old cpufrequtils provides and requires (predecessor)
- Update libcpupower description

OBS-URL: https://build.opensuse.org/request/show/707851
OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=92
---
 cpupower-5.1.tar.bz2                    |  4 ++--
 cpupower.changes                        |  7 +++++++
 cpupower.spec                           | 11 ++++-------
 cpupower_export_tarball_from_git.sh     |  7 ++-----
 turbostat-19.03.20.tar.bz2              |  4 ++--
 x86_energy_perf_policy-17.05.11.tar.bz2 |  4 ++--
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/cpupower-5.1.tar.bz2 b/cpupower-5.1.tar.bz2
index 45853f6..9e00324 100644
--- a/cpupower-5.1.tar.bz2
+++ b/cpupower-5.1.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e40992e01bfd98bebd179479fa9676c285a5c6bbb81babbbd0153c7d5915e060
-size 73530
+oid sha256:b135312bc54544acfdf3d1dfdb78137a86c273b4040a8538d08fc0026735153b
+size 73390
diff --git a/cpupower.changes b/cpupower.changes
index 4354cd0..6db716c 100644
--- a/cpupower.changes
+++ b/cpupower.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun  5 11:38:15 UTC 2019 - trenn@suse.de
+
+- Update to kernel version 5.1 final
+- Remove very old cpufrequtils provides and requires (predecessor)
+- Update libcpupower description
+
 -------------------------------------------------------------------
 Mon Apr  8 14:12:34 UTC 2019 - trenn@suse.de
 
diff --git a/cpupower.spec b/cpupower.spec
index 1ae43ea..20bab67 100644
--- a/cpupower.spec
+++ b/cpupower.spec
@@ -45,25 +45,24 @@ Patch30:        x86_perf_makefile_fix_asm_header.patch
 BuildRequires:  gettext-tools
 BuildRequires:  pciutils
 BuildRequires:  pciutils-devel
-Obsoletes:      cpufrequtils
-Provides:       cpufrequtils = %{version}
 
 %description
 This tool accesses the Linux kernel's processor power subsystems
 like CPU frequency switching (cpufreq) or CPU sleep states (cpuidle).
 
 %package -n libcpupower0
-Summary:        Obsolete processor frequency related C-library
+Summary:        Processor power related C-library
 Group:          System/Libraries
 
 %description -n libcpupower0
-Contains libcpupower.
+Contains libcpupower which offers easy functions to access
+processor frequency, processor idle, processor power hierarchy
+and other CPU power consumption related information.
 
 %package devel
 Summary:        Include files for libcpupower
 Group:          Development/Languages/C and C++
 Requires:       libcpupower0 = %{version}
-Conflicts:      cpufrequtils-devel
 
 %description devel
 Include files for C/C++ development with libcpupower.
@@ -71,8 +70,6 @@ Include files for C/C++ development with libcpupower.
 %package bench
 Summary:        CPU frequency micro benchmark
 Group:          System/Benchmark
-Obsoletes:      cpufrequtils-bench < %{version}
-Provides:       cpufrequtils-bench = %{version}
 
 %description bench
 This benchmark helps to test the condition of a given kernel cpufreq
diff --git a/cpupower_export_tarball_from_git.sh b/cpupower_export_tarball_from_git.sh
index 8298df5..8abea1d 100644
--- a/cpupower_export_tarball_from_git.sh
+++ b/cpupower_export_tarball_from_git.sh
@@ -35,10 +35,8 @@ function parse_args()
                 GIT_TAG="$OPTARG"
                 ;;
             t)
-		echo XXXXXXXXX
 		TOOL="$OPTARG"
 		echo $TOOL
-		echo YYYYYYYY
                 ;;
             ?|h)
                 usage
@@ -124,7 +122,7 @@ set +x
 parse_args $*
 
 DIR=`mktemp -d`
-pushd $DIR
+pushd "$DIR"
 
 if [ "$GIT_DIR" = "" ];then
     export GIT_DIR=/archteam/trenn/git/linux-2.6/.git
@@ -132,7 +130,6 @@ fi
 
 case $TOOL in
     cpupower)
-	echo XXX
         export_cpupower
         ;;
     turbostat)
@@ -148,4 +145,4 @@ case $TOOL in
 	exit 1
 	;;
 esac
-#rm -rf "$DIR"
+rm -rf "$DIR"
diff --git a/turbostat-19.03.20.tar.bz2 b/turbostat-19.03.20.tar.bz2
index caf4c21..38e3d7d 100644
--- a/turbostat-19.03.20.tar.bz2
+++ b/turbostat-19.03.20.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25c950135194d897f1e8cb09a279e25e0a37788174da25709b0d12c1c5658468
-size 43226
+oid sha256:8b2855d26494b9fea63669fdaa3db3e09c86db60f3cad8b23417b0d18f73f5d0
+size 43178
diff --git a/x86_energy_perf_policy-17.05.11.tar.bz2 b/x86_energy_perf_policy-17.05.11.tar.bz2
index c2cb7e7..5725faa 100644
--- a/x86_energy_perf_policy-17.05.11.tar.bz2
+++ b/x86_energy_perf_policy-17.05.11.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ae25e9d6eb4482e08398727beaab06a1cf21458528d8282e4f7028fc86b0b74
-size 18510
+oid sha256:102ce02c344a6eb9cd4b134dcbb25f14b09fd6d64363ad9dd74c096076fa0f23
+size 18483