rpms/glib2/devel glib2.spec,1.221,1.222

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22399

Modified Files:
	glib2.spec 
Log Message:
Avoid multilib conflicts



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- glib2.spec	23 Sep 2009 20:39:17 -0000	1.221
+++ glib2.spec	24 Sep 2009 14:30:56 -0000	1.222
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -81,6 +81,10 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
 
+# These cause multilib conflicts, and we don't really need precompiled
+# versions of these tiny scripts
+rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
+
 %find_lang glib20
 
 %clean
@@ -123,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-3
+- Avoid multilib conflicts (#525213)
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-2
 - Fix location of gdb macros