From 387160a3882d491bf57f2fde77efff8fbeebc9be Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 24 Sep 2008 13:29:30 +0000 Subject: [PATCH] - a subtle bug in python submakefile broke the 0.4.6-1.fc9 build #463733 daniel --- libvirt.spec | 7 ++++++- python_make.patch | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 python_make.patch diff --git a/libvirt.spec b/libvirt.spec index 8bc3973..9835b19 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -30,10 +30,11 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.4.6 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?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 @@ -147,6 +148,7 @@ of recent versions of Linux (and other OSes). %prep %setup -q +%patch0 -p0 %build %if ! %{with_xen} @@ -302,6 +304,9 @@ fi %doc docs/examples/python %changelog +* Wed Sep 24 2008 Daniel Veillard - 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 - 0.4.6-1.fc9 - upstream release 0.4.6 - fixes a couple of serious bugs in the previous release diff --git a/python_make.patch b/python_make.patch new file mode 100644 index 0000000..d451524 --- /dev/null +++ b/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 $@ +