From ed51f8026d933088f1abac7d7c8343fc0629267a93a35fadb5d0effd0755d3e8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Dec 2008 11:30:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=20 --- fontconfig.changes | 6 ++++++ fontconfig.spec | 11 ++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fontconfig.changes b/fontconfig.changes index 2c250e3..2f59063 100644 --- a/fontconfig.changes +++ b/fontconfig.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) + ------------------------------------------------------------------- Mon Nov 24 12:34:56 CET 2008 - olh@suse.de diff --git a/fontconfig.spec b/fontconfig.spec index b57b36c..990958e 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -33,12 +33,9 @@ AutoReqProv: on %ifarch ppc64 Obsoletes: fontconfig-64bit %endif -%ifarch %ix86 ppc -Obsoletes: fontconfig-32bit -%endif Requires: bash Version: 2.6.0 -Release: 7 +Release: 8 Summary: Library for Font Configuration # CVS can be found here: (CVS is gone, fontconfig uses git now). # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login @@ -106,9 +103,6 @@ Summary: Include Files and Libraries mandatory for Development. %ifarch ppc64 Obsoletes: fontconfig-devel-64bit %endif -%ifarch %ix86 ppc -Obsoletes: fontconfig-devel-32bit -%endif %description devel This package countains all include files, libraries, configuration @@ -264,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/fontconfig/ %changelog +* Wed Dec 10 2008 olh@suse.de +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) * Mon Nov 24 2008 olh@suse.de - obsolete old -XXbit packages (bnc#437293, bnc#439840) * Fri Nov 07 2008 mfabian@suse.de