Ensure PolicyKit is enabled (#446616)

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

branch

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

libvirt.spec

@@ -1,12 +1,10 @@
 # -*- rpm-spec -*-
 
-%if "%{fedora}" >= "8"
+%if 0%{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
 
@@ -23,7 +21,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.4.2
-Release: 2%{?dist}%{?extra_release}
+Release: 4%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -46,9 +44,6 @@ 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
@@ -86,9 +81,6 @@ 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
@@ -182,6 +174,8 @@ 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
@@ -247,15 +241,14 @@ 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
@@ -289,7 +282,14 @@ fi
 %doc docs/examples/python
 
 %changelog
-* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-2.fc10
+* 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
 - Enable lokkit support (#443796)
 
 * Tue Apr  8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.2-1.fc9