rpms/libbonobo/devel libbonobo.spec,1.43,1.44

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30389

Modified Files:
	libbonobo.spec 
Log Message:
Fix multilib conflicts



Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libbonobo.spec	12 Jul 2006 21:44:06 -0000	1.43
+++ libbonobo.spec	27 Jul 2006 22:46:24 -0000	1.44
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.15.0
-Release: 1
+Release: 2
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -58,7 +58,7 @@
 aclocal
 automake
 autoconf
-%configure --enable-gtk-doc
+%configure --disable-gtk-doc
 
 make
 
@@ -73,6 +73,7 @@
 ## kill other stuff
 rm $RPM_BUILD_ROOT%{_bindir}/echo-client-2
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.*a
 rm $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.*a
 
@@ -108,7 +109,6 @@
 %files devel
 %defattr(-,root,root)
 
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
@@ -117,6 +117,10 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-2
+- disable gtk-doc to fix multilib conflicts
+- Don't ship static libraries
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-1
 - Update to 2.15.0