Ensure %{fedora} is evaluated correctly

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

branch

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

libvirt.spec

@@ -3,8 +3,6 @@
 %define with_xen       1
 %define with_xen_proxy 1
 %define with_qemu      1
-%define with_openvz    1
-%define with_lxc       1
 %define with_polkit    0
 
 # Xen is available only on i386 x86_64 ia64
@@ -29,13 +27,12 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.6
-Release: 2%{?dist}%{?extra_release}
-License: LGPLv2+
+Version: 0.4.2
+Release: 6%{?dist}%{?extra_release}
+License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch0: python_make.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -56,9 +53,6 @@ Requires: PolicyKit >= 0.6
 %endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
-# For showmount in FS driver (netfs discovery)
-BuildRequires: nfs-utils
-Requires: nfs-utils
 %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
@@ -78,7 +72,6 @@ Requires: parted
 BuildRequires: xen-devel
 %endif
 BuildRequires: libxml2-devel
-BuildRequires: xhtml1-dtds
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
@@ -148,7 +141,6 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %if ! %{with_xen}
@@ -159,22 +151,12 @@ of recent versions of Linux (and other OSes).
 %define _without_qemu --without-qemu
 %endif
 
-%if ! %{with_openvz}
-%define _without_openvz --without-openvz
-%endif
-
-%if ! %{with_lxc}
-%define _without_lxc --without-lxc
-%endif
-
 %configure %{?_without_xen} \
            %{?_without_qemu} \
-           %{?_without_openvz} \
-           %{?_without_lxc} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-make %{?_smp_mflags}
+make
 
 %install
 rm -fr %{buildroot}
@@ -257,21 +239,14 @@ fi
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
-%{_datadir}/augeas/lenses/libvirtd.aug
-%{_datadir}/augeas/lenses/libvirtd_qemu.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %if %{with_polkit}
-%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
+%{_datadir}/PolicyKit/policy/libvirtd.policy
 %endif
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
 %if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
-%if %{with_lxc}
-%attr(0755, root, root) %{_libexecdir}/libvirt_lxc
-%endif
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %doc docs/*.rng
 %doc docs/*.xml
@@ -304,43 +279,20 @@ fi
 %doc docs/examples/python
 
 %changelog
-* Wed Sep 24 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-2.fc9
-- a subtle bug in python submakefile broke the 0.4.6-1.fc9 build #463733
-
-* Wed Sep 24 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-1.fc9
-- upstream release 0.4.6
-- fixes a couple of serious bugs in the previous release
-
-* Tue Sep  9 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-2.fc9
-- fix a crash if a QEmu/KVM domain is defined without an emulator path
-
-* Mon Sep  8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-1.fc9
-- upstream release 0.4.5
-- a lot of bug fixes
-- major updates to QEmu/KVM and Linux containers drivers
-- support for OpenVZ if installed
-
-* Tue Jul  8 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.4-2.fc9
-- Fix booting of CDROM images with KVM (rhbz #452355)
-
-* 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
+* Wed Jun  4 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-6.fc10
 - Disable lokkit support again (#449996, #447633)
-- Ensure PolicyKit is enabled (#446616)
+- Ensure %{fedora} is evaluated correctly
 
-* Fri May  9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-3.fc9
+* 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
 - 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-3.fc10
+- Simplify the way arch conditionals are handled
+
+* 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

python_make.patch

@@ -1,35 +0,0 @@
-Index: python/Makefile.am
-===================================================================
-RCS file: /data/cvs/libxen/python/Makefile.am,v
-retrieving revision 1.13
-diff -u -p -r1.13 Makefile.am
---- python/Makefile.am	5 Feb 2008 19:27:37 -0000	1.13
-+++ python/Makefile.am	24 Sep 2008 13:21:06 -0000
-@@ -50,7 +50,7 @@ GENERATED= libvirt-export.c \
- $(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
- 	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
- 
--libvirt.py: $(srcdir)/libvir.py libvirtclass.py
-+libvirt.py: $(srcdir)/libvir.py $(GENERATED)
- 	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
- 	mv $@-t $@
- 
-*** python/Makefile.in.orig	2008-09-24 15:19:20.000000000 +0200
---- python/Makefile.in	2008-09-24 15:20:07.000000000 +0200
-*************** uninstall-am: uninstall-local uninstall-
-*** 1027,1033 ****
-  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
-  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
-  
-! @WITH_PYTHON_TRUE@libvirt.py: $(srcdir)/libvir.py libvirtclass.py
-  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
-  @WITH_PYTHON_TRUE@	mv $@-t $@
-  
---- 1027,1033 ----
-  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
-  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
-  
-! @WITH_PYTHON_TRUE@libvirt.py: $(srcdir)/libvir.py $(GENERATED)
-  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
-  @WITH_PYTHON_TRUE@	mv $@-t $@
-  

sources

@@ -1 +1 @@
-abdf727deaffd868172f7243eb75ffe3  libvirt-0.4.6.tar.gz
+c87e3d91eaa9445bb3cb1ba191573c83  libvirt-0.4.2.tar.gz