From 6bb404da7553a90f0335990307150bd4592602773df8de15d43f72b0efa45cb3 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 15 Dec 2008 11:21:30 +0000
Subject: [PATCH] OBS-URL:
https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=19
---
cairo.changes | 6 ++++++
cairo.spec | 11 ++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/cairo.changes b/cairo.changes
index e1afced..6dd2a3f 100644
--- a/cairo.changes
+++ b/cairo.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)
+
-------------------------------------------------------------------
Tue Nov 11 16:54:06 CET 2008 - ro@suse.de
diff --git a/cairo.spec b/cairo.spec
index c937d4f..a40e87a 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -35,7 +35,7 @@ Group: Development/Libraries/X11
Summary: Vector Graphics Library with Cross-Device Output Support
Url: http://cairographics.org/
Version: 1.8.0
-Release: 4
+Release: 5
Source: %{name}-%{version}.tar.bz2
Patch1: cairo-ac.patch
# PATCH-NEEDS-REBASE bugzilla-104365.patch bnc104365 -- it needs a rename too!
@@ -50,9 +50,6 @@ Provides: libpixman <= 0.1.1
%ifarch ppc64
Obsoletes: cairo-64bit
%endif
-%ifarch %ix86 ppc
-Obsoletes: cairo-32bit
-%endif
#
%description
@@ -90,9 +87,6 @@ Provides: libpixman-devel <= 0.1.1
%ifarch ppc64
Obsoletes: cairo-devel-64bit
%endif
-%ifarch %ix86 ppc
-Obsoletes: cairo-devel-32bit
-%endif
#
%description devel
@@ -175,6 +169,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Dec 10 2008 olh@suse.de
+- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade
+ (bnc#437293)
* Tue Nov 11 2008 ro@suse.de
- SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf
* Tue Nov 04 2008 maw@suse.de