diff --git a/freetype2.changes b/freetype2.changes index fd33bc7..35538d4 100644 --- a/freetype2.changes +++ b/freetype2.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) + ------------------------------------------------------------------- Wed Nov 05 16:58:22 CET 2008 - mfabian@suse.de diff --git a/freetype2.spec b/freetype2.spec index 89929ff..3afeed2 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -27,12 +27,9 @@ AutoReqProv: on %ifarch ppc64 Obsoletes: freetype2-64bit %endif -%ifarch %ix86 ppc -Obsoletes: freetype2-32bit -%endif # Version: 2.3.7 -Release: 23 +Release: 24 Url: http://www.freetype.org Summary: A TrueType Font Library # CVS repository: @@ -76,9 +73,6 @@ Requires: %{name} = %{version}, zlib-devel %ifarch ppc64 Obsoletes: freetype2-devel-64bit %endif -%ifarch %ix86 ppc -Obsoletes: freetype2-devel-32bit -%endif # %description devel @@ -169,6 +163,9 @@ make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install /usr/share/aclocal/* %changelog +* Wed Dec 10 2008 olh@suse.de +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) * Wed Nov 05 2008 mfabian@suse.de - bnc#441638: use fix from upstream CVS to fix the return value of FT_Get_TrueType_Engine_Type (and make it work as documented). diff --git a/ft2demos.spec b/ft2demos.spec index de5d444..ad534b1 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -27,7 +27,7 @@ AutoReqProv: on Supplements: fonts-config %endif Version: 2.3.7 -Release: 30 +Release: 31 %define freetype_version %{version} Url: http://www.freetype.org Summary: Freetype2 Utilities and Demo Programs