diff --git a/libgpg-error.changes b/libgpg-error.changes index e4bafad..706d06d 100644 --- a/libgpg-error.changes +++ b/libgpg-error.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) + ------------------------------------------------------------------- Thu Oct 30 12:34:56 CET 2008 - olh@suse.de diff --git a/libgpg-error.spec b/libgpg-error.spec index ab5f782..b2f8eb2 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -21,7 +21,7 @@ Name: libgpg-error Url: http://www.gnupg.org/ Version: 1.6 -Release: 5 +Release: 6 Summary: Library That Defines Common Error Values for All GnuPG Components License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/C and C++ @@ -30,9 +30,6 @@ AutoReqProv: on %ifarch ppc64 Obsoletes: libgpg-error-64bit %endif -%ifarch %ix86 ppc -Obsoletes: libgpg-error-32bit -%endif # Source: %name-%version.tar.bz2 # rename package to "libgpg-error-nld" and set this to 1 for NLD @@ -77,9 +74,6 @@ Group: Development/Libraries/C and C++ %ifarch ppc64 Obsoletes: libgpg-error-devel-64bit %endif -%ifarch %ix86 ppc -Obsoletes: libgpg-error-devel-32bit -%endif # %if %nld_build Conflicts: libgpg-error-devel @@ -149,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT %_libdir/libgpg-error*.so %changelog +* Wed Dec 10 2008 olh@suse.de +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) * Thu Oct 30 2008 olh@suse.de - obsolete old -XXbit packages (bnc#437293) * Sun May 11 2008 coolo@suse.de