diff --git a/glib2.changes b/glib2.changes index 331770c..b2d354e 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 24 12:34:56 CET 2008 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + ------------------------------------------------------------------- Tue Nov 11 16:54:09 CET 2008 - ro@suse.de diff --git a/glib2.spec b/glib2.spec index 7fa7f75..74d3831 100644 --- a/glib2.spec +++ b/glib2.spec @@ -27,8 +27,16 @@ BuildRequires: libselinux-devel License: LGPL v2.1 or later Group: Development/Libraries/C and C++ AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: glib2-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: glib2-32bit +%endif +# Version: 2.18.2 -Release: 3 +Release: 4 Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2 @@ -142,6 +150,14 @@ Requires: libgobject-2_0-0 = %{version} Summary: Include files and libraries mandatory for development Group: Development/Libraries/C and C++ AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: glib2-devel-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: glib2-devel-32bit +%endif +# %description devel This package contains all necessary include files, libraries, @@ -175,6 +191,14 @@ License: LGPL v2.1 or later Summary: A Library with Convenient Functions Written in C Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +# bug437293 +%ifarch ppc64 +Obsoletes: glib2-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: glib2-32bit +%endif +# %description -n libglib-2_0-0 This library provides convenient functions, such as lists and hashes, @@ -204,6 +228,14 @@ License: LGPL v2.1 or later Summary: A Library with Convenient Functions Written in C Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +# bug437293 +%ifarch ppc64 +Obsoletes: glib2-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: glib2-32bit +%endif +# %description -n libgmodule-2_0-0 This library provides convenient functions, such as lists and hashes, @@ -233,6 +265,14 @@ License: LGPL v2.1 or later Summary: A Library with Convenient Functions Written in C Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +# bug437293 +%ifarch ppc64 +Obsoletes: glib2-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: glib2-32bit +%endif +# # Temporarily disable this, pending further discussion # Recommends: gvfs @@ -293,6 +333,14 @@ License: LGPL v2.1 or later Summary: A Library with Convenient Functions Written in C Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +# bug437293 +%ifarch ppc64 +Obsoletes: glib2-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: glib2-32bit +%endif +# %description -n libgthread-2_0-0 This library provides convenient functions, such as lists and hashes, @@ -322,6 +370,14 @@ License: LGPL v2.1 or later Summary: A Library with Convenient Functions Written in C Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +# bug437293 +%ifarch ppc64 +Obsoletes: glib2-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: glib2-32bit +%endif +# %description -n libgobject-2_0-0 This library provides convenient functions, such as lists and hashes, @@ -524,6 +580,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/gtk-doc/html %changelog +* Mon Nov 24 2008 olh@suse.de +- obsolete old -XXbit packages (bnc#437293) * Tue Nov 11 2008 ro@suse.de - SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf * Thu Nov 06 2008 federico@novell.com