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] 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