From e0bbd77b4b00ddd5e26b7efa9e0e28ee4f222857 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 27 Jun 2007 22:33:09 +0000 Subject: [PATCH] Remove Makefile & Makefile.in from RPM to avoid multilib issues --- ChangeLog | 5 +++++ libvirt.spec.in | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 261cd13508..202243b199 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 27 18:32:00 EST 2007 Daniel P. Berrange + + * libvirt.spec.in: Remove Makefile & Makefile.in from -devel + packages to avoid multilib conflicts + Tue Jun 26 19:56:00 EST 2007 Daniel P. Berrange * qemud/driver.c, qemud/driver.h, qemud/conf.c, qemud/conf.h, diff --git a/libvirt.spec.in b/libvirt.spec.in index 4ac03dd9b5..af419f84b6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -63,7 +63,8 @@ make rm -fr %{buildroot} %makeinstall -(cd docs/examples ; make clean ; rm -rf .deps) +(cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) +(cd docs/examples/python ; rm -f Makefile Makefile.in) rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la