From a28db6745e2c561d0d4c13ce839919d52bed3079 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 23 Feb 2015 11:47:22 +0100 Subject: [PATCH] libcpufreq-devel: conflicts with libcpupower-devel. --- srcpkgs/cpufrequtils/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template index 6b4409b2a31..326233f53bf 100644 --- a/srcpkgs/cpufrequtils/template +++ b/srcpkgs/cpufrequtils/template @@ -1,7 +1,7 @@ # Template file for 'cpufrequtils' pkgname=cpufrequtils version=008 -revision=5 +revision=6 short_desc="Userspace tools for the Linux kernel cpufreq subsystem" homepage="ftp://ftp.archlinux.org/other/cpufrequtils/" license="GPL-2" @@ -12,7 +12,7 @@ checksum=1b9daa591d977679fb09ffb9b4d58afa94b9387f3c0be92ec077080e328130f1 only_for_archs="i686 x86_64" do_build() { - make CC=$CC CFLAGS="$CFLAGS" STRIP=: V=1 + make CC=$CC CFLAGS="$CFLAGS" STRIP=: } do_install() { sed -i "s|/usr/bin/install|install|g" Makefile @@ -26,6 +26,7 @@ libcpufreq_package() { } } libcpufreq-devel_package() { + conflicts="libcpupower-devel>=0" depends="libcpufreq>=${version}_${revision}" short_desc="libcpufreq - development tools" pkg_install() {