Fix for #465274, Daniel

daniel

libvirt.spec

@@ -26,7 +26,7 @@
 %endif
 %endif
 
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 %define with_polkit    0%{!?_without_polkit:1}
 %define with_xen_proxy 0
 %endif
@@ -34,10 +34,11 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.4.6
-Release: 1%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
+Patch0: python_make.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -159,6 +160,7 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %if ! %{with_xen}
@@ -238,6 +240,11 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 # Strip auto-generated UUID - we need it generated per-install
 sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
+%else
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
 %find_lang %{name}
 
@@ -256,6 +263,7 @@ rm -fr %{buildroot}
 /sbin/ldconfig
 
 %if %{with_libvirtd}
+%if %{with_qemu}
 # We want to install the default network for initial RPM installs
 # or on the first upgrade from a non-network aware libvirt only.
 # We check this by looking to see if the daemon is already installed
@@ -268,6 +276,7 @@ then
          > %{_sysconfdir}/libvirt/qemu/networks/default.xml
     ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 fi
+%endif
 
 /sbin/chkconfig --add libvirtd
 %endif
@@ -387,6 +396,13 @@ fi
 %endif
 
 %changelog
+* Wed Sep 24 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-3.fc10
+- apply the python makefile patch for #463733
+
+* Wed Sep 24 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-2.fc10
+- upstream release 0.4.6
+- fixes some problems with 0.4.5
+
 * Tue Sep  9 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-2.fc10
 - fix a crash if a QEmu/KVM domain is defined without an emulator path
 

python_make.patch

@@ -0,0 +1,35 @@
+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 $@
+