From af60aea4fa89c94886d25108f1b4fc9f26ac50dbde3127785ddd2ea75b6812cc Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Dec 2008 11:34:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=18 --- gnutls.changes | 6 ++++++ gnutls.spec | 11 ++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gnutls.changes b/gnutls.changes index 50a935d..6fb9ec3 100644 --- a/gnutls.changes +++ b/gnutls.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 28 06:53:37 CET 2008 - jshi@suse.de diff --git a/gnutls.spec b/gnutls.spec index 2efbc24..c3e0ef3 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -21,7 +21,7 @@ Name: gnutls BuildRequires: gcc-c++ libgcrypt-devel libopencdk-devel Version: 2.4.1 -Release: 23 +Release: 24 License: GPL v3 or later; LGPL v2.1 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.gnutls.org/ @@ -35,9 +35,6 @@ AutoReqProv: on %ifarch ppc64 Obsoletes: gnutls-64bit %endif -%ifarch %ix86 ppc -Obsoletes: gnutls-32bit -%endif # %description @@ -123,9 +120,6 @@ Provides: gnutls-devel = %version %ifarch ppc64 Obsoletes: gnutls-devel-64bit %endif -%ifarch %ix86 ppc -Obsoletes: gnutls-devel-32bit -%endif # %description -n libgnutls-extra-devel @@ -232,6 +226,9 @@ rm -rf %buildroot %_libdir/pkgconfig/gnutls-extra.pc %changelog +* Wed Dec 10 2008 olh@suse.de +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) * Fri Nov 28 2008 jshi@suse.de - fix security bug [bnc#441856] CVE-2008-4989