From 64c67787474433a4d78d025926bc215a0c7ffd66b3fb65cfa572f74e874f9503 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Dec 2008 11:29:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/expat?expand=0&rev=9 --- expat.changes | 6 ++++++ expat.spec | 11 ++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/expat.changes b/expat.changes index b769b9f..b8e952e 100644 --- a/expat.changes +++ b/expat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 10 12:34:56 CET 2008 - olh@suse.de + +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) + ------------------------------------------------------------------- Thu Oct 30 12:34:56 CET 2008 - olh@suse.de diff --git a/expat.spec b/expat.spec index 1532a0b..db2ca9f 100644 --- a/expat.spec +++ b/expat.spec @@ -20,7 +20,7 @@ Name: expat Version: 2.0.1 -Release: 87 +Release: 88 Group: Development/Libraries/C and C++ License: X11/MIT Url: http://expat.sourceforge.net/ @@ -28,9 +28,6 @@ Url: http://expat.sourceforge.net/ %ifarch ppc64 Obsoletes: expat-64bit %endif -%ifarch %ix86 ppc -Obsoletes: expat-32bit -%endif # Summary: XML Parser Toolkit Source0: %{name}-%{version}.tar.bz2 @@ -74,9 +71,6 @@ Group: Development/Libraries/C and C++ %ifarch ppc64 Obsoletes: expat-64bit %endif -%ifarch %ix86 ppc -Obsoletes: expat-32bit -%endif # %description -n libexpat1 @@ -192,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libexpat.so %changelog +* Wed Dec 10 2008 olh@suse.de +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) * Thu Oct 30 2008 olh@suse.de - obsolete old -XXbit packages (bnc#437293) * Thu Apr 10 2008 ro@suse.de