Upstream release of 0.4.4, Daniel

- Disable lokkit support again (#449996, #447633)

.cvsignore

@@ -4,4 +4,3 @@ i686
 x86_64
 libvirt-*.tar.gz
 libvirt-0.4.2.tar.gz
-libvirt-0.4.3.tar.gz

branch

@@ -0,0 +1 @@
+F-9

libvirt.spec

@@ -1,33 +1,26 @@
 # -*- rpm-spec -*-
 
-%define with_xen       1
-%define with_xen_proxy 1
-%define with_qemu      1
-%define with_polkit    0
-
-# Xen is available only on i386 x86_64 ia64
-%ifnarch i386 i686 x86_64 ia64
-%define with_xen 0
-%endif
-
-%if ! %{with_xen}
-%define with_xen_proxy 0
+%if 0%{fedora} >= 8
+%define with_polkit 1
+%define with_proxy no
+%else
+%define with_polkit 0
+%define with_proxy yes
 %endif
 
 %if "%{fedora}"
 %ifarch ppc64
 %define with_qemu 0
+%else
+%define with_qemu 1
 %endif
-%endif
-
-%if 0%{fedora} >= 8
-%define with_polkit    1
-%define with_xen_proxy 0
+%else
+%define with_qemu 0
 %endif
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.3
+Version: 0.4.4
 Release: 1%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
@@ -53,11 +46,12 @@ Requires: PolicyKit >= 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
 Requires: /usr/bin/qemu-img
 %else
-%if %{with_xen}
 # From Xen RPMs
 Requires: /usr/sbin/qcow-create
 %endif
@@ -68,7 +62,7 @@ Requires: lvm2
 Requires: iscsi-initiator-utils
 # For disk driver
 Requires: parted
-%if %{with_xen}
+%ifarch i386 x86_64 ia64
 BuildRequires: xen-devel
 %endif
 BuildRequires: libxml2-devel
@@ -89,11 +83,12 @@ 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
 %else
-%if %{with_xen}
 # From Xen RPMs
 BuildRequires: /usr/sbin/qcow-create
 %endif
@@ -118,7 +113,7 @@ Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
 Requires: libvirt = %{version}
 Requires: pkgconfig
-%if %{with_xen}
+%ifarch i386 x86_64 ia64
 Requires: xen-devel
 %endif
 Obsoletes: libvir-devel
@@ -143,19 +138,27 @@ of recent versions of Linux (and other OSes).
 %setup -q
 
 %build
-%if ! %{with_xen}
-%define _without_xen --without-xen
-%endif
-
-%if ! %{with_qemu}
-%define _without_qemu --without-qemu
-%endif
-
-%configure %{?_without_xen} \
-           %{?_without_qemu} \
+# Xen is available only on i386 x86_64 ia64
+%ifarch i386 i686 x86_64 ia64
+%configure --with-init-script=redhat \
+           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+           --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
 
 %install
@@ -243,7 +246,7 @@ fi
 %{_datadir}/PolicyKit/policy/libvirtd.policy
 %endif
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%if %{with_xen_proxy}
+%if %{with_proxy} == "yes"
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
@@ -279,26 +282,24 @@ fi
 %doc docs/examples/python
 
 %changelog
-* Thu Jun 12 2008 Daniel Veillard <veillard@redhat.com> - 0.4.3-1.fc10
+* Thu Jun 25 2008 Daniel Veillard <veillard@redhat.com> - 0.4.4-1.fc9
+- upstream release of 0.4.4
+- fixes a few bug in previous release
+
+* Thu Jun 12 2008 Daniel Veillard <veillard@redhat.com> - 0.4.3-1.fc9
 - upstream release 0.4.3
 - many bug fixes
 - many small improvements
 - serious xenner fixes
 
-* Wed Jun  4 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-6.fc10
+* Wed Jun  4 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-4.fc9
 - Disable lokkit support again (#449996, #447633)
-- Ensure %{fedora} is evaluated correctly
+- Ensure PolicyKit is enabled (#446616)
 
-* Thu May 15 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-5.fc10
-- Rebuild with policy enabled (rhbz #446616)
-
-* Fri May  9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-4.fc10
+* Fri May  9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-3.fc9
 - Added directory for initrd/kernel images for SELinux policy
 
-* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-3.fc10
-- Simplify the way arch conditionals are handled
-
-* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-2.fc10
+* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-2.fc9
 - Enable lokkit support (#443796)
 
 * Tue Apr  8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.2-1.fc9

sources

@@ -1 +1 @@
-f08319891fda8e4c7ce08e9a782e2543  libvirt-0.4.3.tar.gz
+9407900dc16e0ba9ea3eec3cf0a56674  libvirt-0.4.4.tar.gz