Remove Makefile & Makefile.in from RPM to avoid multilib issues

diff --git a/ChangeLog b/ChangeLog
index 261cd13508cb9cdb95ab80b31a6ab57a89d9d27f..202243b19995be3484a89eeca333c5eda12bc1bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 27 18:32:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * 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 <berrange@redhat.com>
 
        * qemud/driver.c, qemud/driver.h, qemud/conf.c, qemud/conf.h,

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 4ac03dd9b549e2cd3a7d28f7215757e17d9f4c59..af419f84b6e97dae3774dded8e8d7bd7300f1833 100644 (file)
--- 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