diff --git a/glib2.spec b/glib2.spec index 4be0f36..3df89e9 100644 --- a/glib2.spec +++ b/glib2.spec @@ -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_ROOT%{_sysconfdir}/profile.d 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 - 2.22.0-3 +- Avoid multilib conflicts (#525213) + * Wed Sep 23 2009 Matthias Clasen - 2.22.0-2 - Fix location of gdb macros