[qemu/epel7: 49/54] Don't build conflicting packages

Lubomir Rintel lkundrak at fedoraproject.org
Wed Feb 26 18:36:32 UTC 2014


commit 63b22659aace4718aa60dd85e0a3d706decd672b
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Wed Feb 26 18:09:09 2014 +0100

    Don't build conflicting packages

 qemu.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/qemu.spec b/qemu.spec
index d3b9ff1..b5b012d 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1139,10 +1139,12 @@ getent passwd qemu >/dev/null || \
 %files
 %defattr(-,root,root)
 
+%if %{without separate_kvm}
 %ifarch %{kvm_archs}
 %files kvm
 %defattr(-,root,root)
 %endif
+%endif
 
 %files common -f %{name}.lang
 %defattr(-,root,root)
@@ -1286,11 +1288,13 @@ getent passwd qemu >/dev/null || \
 %endif
 %endif
 
+%if %{without separate_kvm}
 %ifarch %{kvm_archs}
 %files kvm-tools
 %defattr(-,root,root,-)
 %{_bindir}/kvm_stat
 %endif
+%endif
 
 %if 0%{?system_alpha:1}
 %files %{system_alpha}


More information about the scm-commits mailing list