From c6aae3e7743387b9f2d9c23adaa0777dfe5b2a414f189cff94c9491d7fcb7fbb Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Dec 2008 12:19:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-libs?expand=0&rev=54 --- xorg-x11-libs.changes | 6 ++++++ xorg-x11-libs.spec | 11 ++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index 3de804d..f8824f6 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.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) + ------------------------------------------------------------------- Fri Nov 21 17:27:22 CET 2008 - schwab@suse.de diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index 18c0afd..8c2e161 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -29,13 +29,10 @@ Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6 %ifarch ppc64 Obsoletes: xorg-x11-libs-64bit %endif -%ifarch %ix86 ppc -Obsoletes: xorg-x11-libs-32bit -%endif # Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 7 +Release: 8 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -121,9 +118,6 @@ AutoReqProv: on %ifarch ppc64 Obsoletes: xorg-x11-devel-64bit %endif -%ifarch %ix86 ppc -Obsoletes: xorg-x11-devel-32bit -%endif # %description -n xorg-x11-devel @@ -250,6 +244,9 @@ exit 0 %{_mandir}/man3/* %changelog +* Wed Dec 10 2008 olh@suse.de +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) * Fri Nov 21 2008 schwab@suse.de - Revert last change. - Use sigsetjmp to save/restore the signal mask.