rpms/libvirt/devel libvirt.spec,1.74,1.75

Daniel Veillard (veillard) fedora-extras-commits at redhat.com
Mon Mar 3 16:04:00 UTC 2008


Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22788

Modified Files:
	libvirt.spec 
Log Message:
More crazyness around ppc64, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- libvirt.spec	3 Mar 2008 15:43:06 -0000	1.74
+++ libvirt.spec	3 Mar 2008 16:03:24 -0000	1.75
@@ -9,7 +9,11 @@
 %endif
 
 %if "%{fedora}"
+%ifarch ppc64
+%define with_qemu 0
+%else
 %define with_qemu 1
+%endif
 %else
 %define with_qemu 0
 %endif
@@ -42,7 +46,7 @@
 %endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
-# PPC64 has no Xen nor QEmu, build anyway
+# PPC64 has no Xen nor QEmu, try to build anyway
 %ifnarch ppc64
 %if %{with_qemu}
 # From QEMU RPMs
@@ -70,13 +74,17 @@
 BuildRequires: libselinux-devel
 BuildRequires: dnsmasq
 BuildRequires: bridge-utils
+%if %{with_qemu}
 BuildRequires: qemu
+%endif
 BuildRequires: cyrus-sasl-devel
 %if %{with_polkit}
 BuildRequires: PolicyKit-devel >= 0.6
 %endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
+# PPC64 has no Xen nor QEmu, try to build anyway
+%ifnarch ppc64
 %if %{with_qemu}
 # From QEMU RPMs
 BuildRequires: /usr/bin/qemu-img
@@ -84,6 +92,7 @@
 # From Xen RPMs
 BuildRequires: /usr/sbin/qcow-create
 %endif
+%endif
 # For LVM drivers
 BuildRequires: lvm2
 # For ISCSI driver
@@ -136,10 +145,18 @@
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid \
            --with-xen-proxy=%{with_proxy}
 %else
+%ifnarch ppc64
 %configure --without-xen \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+%else
+%configure --without-xen \
+           --without-qemu \
+           --with-init-script=redhat \
+           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+%endif
 %endif
 
 make




More information about the fedora-extras-commits mailing list