From 9b89c9eaa8aa6350a1909d43e3a49ccf87806d87e1200ff0ec8fefd9d775e97e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Dec 2008 12:09:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgcrypt?expand=0&rev=10 --- libgcrypt.changes | 6 ++++++ libgcrypt.spec | 11 ++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libgcrypt.changes b/libgcrypt.changes index 8a18abb..5986212 100644 --- a/libgcrypt.changes +++ b/libgcrypt.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 17:23:54 CET 2008 - mkoenig@suse.de diff --git a/libgcrypt.spec b/libgcrypt.spec index 9ae2be9..f1b3509 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -22,7 +22,7 @@ Name: libgcrypt BuildRequires: libgpg-error-devel Url: http://www.gnu.org/directory/Security/libgcrypt.html Version: 1.4.1 -Release: 3 +Release: 4 Summary: The GNU Crypto Library License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/C and C++ @@ -31,9 +31,6 @@ AutoReqProv: on %ifarch ppc64 Obsoletes: libgcrypt-64bit %endif -%ifarch %ix86 ppc -Obsoletes: libgcrypt-32bit -%endif # Source: %name-%version.tar.bz2 Patch0: %name-ppc64.patch @@ -93,9 +90,6 @@ Requires: libgcrypt11 = %version, libgpg-error-devel, glibc-devel %ifarch ppc64 Obsoletes: libgcrypt-devel-64bit %endif -%ifarch %ix86 ppc -Obsoletes: libgcrypt-devel-32bit -%endif # PreReq: %install_info_prereq @@ -189,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT %_datadir/aclocal/libgcrypt.m4 %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 mkoenig@suse.de - build rijndael.c with -fno-strict-aliasing [bnc#443693] * Thu Oct 30 2008 olh@suse.de