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