libcpufreq-devel: conflicts with libcpupower-devel.

This commit is contained in:
Juan RP 2015-02-23 11:47:22 +01:00
parent 147db7e2f3
commit a28db6745e

View file

@ -1,7 +1,7 @@
# Template file for 'cpufrequtils' # Template file for 'cpufrequtils'
pkgname=cpufrequtils pkgname=cpufrequtils
version=008 version=008
revision=5 revision=6
short_desc="Userspace tools for the Linux kernel cpufreq subsystem" short_desc="Userspace tools for the Linux kernel cpufreq subsystem"
homepage="ftp://ftp.archlinux.org/other/cpufrequtils/" homepage="ftp://ftp.archlinux.org/other/cpufrequtils/"
license="GPL-2" license="GPL-2"
@ -12,7 +12,7 @@ checksum=1b9daa591d977679fb09ffb9b4d58afa94b9387f3c0be92ec077080e328130f1
only_for_archs="i686 x86_64" only_for_archs="i686 x86_64"
do_build() { do_build() {
make CC=$CC CFLAGS="$CFLAGS" STRIP=: V=1 make CC=$CC CFLAGS="$CFLAGS" STRIP=:
} }
do_install() { do_install() {
sed -i "s|/usr/bin/install|install|g" Makefile sed -i "s|/usr/bin/install|install|g" Makefile
@ -26,6 +26,7 @@ libcpufreq_package() {
} }
} }
libcpufreq-devel_package() { libcpufreq-devel_package() {
conflicts="libcpupower-devel>=0"
depends="libcpufreq>=${version}_${revision}" depends="libcpufreq>=${version}_${revision}"
short_desc="libcpufreq - development tools" short_desc="libcpufreq - development tools"
pkg_install() { pkg_install() {