[qemu/epel7: 11/23] Don't build conflicting packages

Lubomir Rintel lkundrak at fedoraproject.org
Sat Apr 19 07:52:38 UTC 2014


commit 611398f68171f2824f2f07e54d43818cb2eebf5f
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 ccb39fb..6b08cf6 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1101,10 +1101,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)
@@ -1251,11 +1253,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