Only include proxy in %files on arches where xen is built

- Enable lokkit support (#443796)

branch

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

libvirt.spec

@@ -1,10 +1,12 @@
 # -*- rpm-spec -*-
 
-%if 0%{fedora} >= 8
+%if "%{fedora}" >= "8"
 %define with_polkit 1
+%define with_lokkit 1
 %define with_proxy no
 %else
 %define with_polkit 0
+%define with_lokkit 0
 %define with_proxy yes
 %endif
 
@@ -20,8 +22,8 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.4
-Release: 1%{?dist}%{?extra_release}
+Version: 0.4.2
+Release: 2%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -44,6 +46,9 @@ Requires: cyrus-sasl-md5
 %if %{with_polkit}
 Requires: PolicyKit >= 0.6
 %endif
+%if %{with_lokkit}
+Requires: /usr/sbin/lokkit
+%endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
 # PPC64 has no Xen nor QEmu, try to build anyway
@@ -81,6 +86,9 @@ BuildRequires: cyrus-sasl-devel
 %if %{with_polkit}
 BuildRequires: PolicyKit-devel >= 0.6
 %endif
+%if %{with_lokkit}
+BuildRequires: /usr/sbin/lokkit
+%endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
 # PPC64 has no Xen nor QEmu, try to build anyway
@@ -174,8 +182,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
 # Default dir for disk images defined in SELinux policy
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/
-# Default dir for kernel+initrd images defnied in SELinux policy
-install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
 
 # We don't want to install /etc/libvirt/qemu/networks in the main %files list
 # because if the admin wants to delete the default network completely, we don't
@@ -241,14 +247,15 @@ fi
 %dir %{_localstatedir}/run/libvirt/
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
 %if %{with_polkit}
 %{_datadir}/PolicyKit/policy/libvirtd.policy
 %endif
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
+%ifarch i386 i686 x86_64 ia64
 %if %{with_proxy} == "yes"
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
+%endif
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %doc docs/*.rng
@@ -282,24 +289,7 @@ fi
 %doc docs/examples/python
 
 %changelog
-* 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-4.fc9
-- Disable lokkit support again (#449996, #447633)
-- Ensure PolicyKit is enabled (#446616)
-
-* 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-2.fc9
+* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-2.fc10
 - Enable lokkit support (#443796)
 
 * Tue Apr  8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.2-1.fc9

sources

@@ -1 +1 @@
-9407900dc16e0ba9ea3eec3cf0a56674  libvirt-0.4.4.tar.gz
+c87e3d91eaa9445bb3cb1ba191573c83  libvirt-0.4.2.tar.gz