diff --git a/libgcrypt.changes b/libgcrypt.changes index 1c3aaa9..0cbeee6 100644 --- a/libgcrypt.changes +++ b/libgcrypt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 30 12:34:56 CET 2008 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + ------------------------------------------------------------------- Mon Jun 30 11:47:59 CEST 2008 - mkoenig@suse.de diff --git a/libgcrypt.spec b/libgcrypt.spec index 825c05b..b371dc1 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -2,9 +2,16 @@ # spec file for package libgcrypt (Version 1.4.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -15,11 +22,19 @@ Name: libgcrypt BuildRequires: libgpg-error-devel Url: http://www.gnu.org/directory/Security/libgcrypt.html Version: 1.4.1 -Release: 1 +Release: 2 Summary: The GNU Crypto Library License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/C and C++ AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: libgcrypt-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: libgcrypt-32bit +%endif +# Source: %name-%version.tar.bz2 Patch0: %name-ppc64.patch Patch1: libgcrypt-strict-aliasing.patch @@ -73,6 +88,14 @@ License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 o Summary: The GNU Crypto Library Group: Development/Libraries/C and C++ Requires: libgcrypt11 = %version, libgpg-error-devel, glibc-devel +# bug437293 +%ifarch ppc64 +Obsoletes: libgcrypt-devel-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: libgcrypt-devel-32bit +%endif +# PreReq: %install_info_prereq %description devel @@ -164,6 +187,8 @@ rm -rf $RPM_BUILD_ROOT %_datadir/aclocal/libgcrypt.m4 %changelog +* Thu Oct 30 2008 olh@suse.de +- obsolete old -XXbit packages (bnc#437293) * Mon Jun 30 2008 mkoenig@suse.de - update to version 1.4.1 * Fixed a bug which led to the comsumption of far too much @@ -260,7 +285,7 @@ rm -rf $RPM_BUILD_ROOT - add libgcrypt-1.1.12-sexp-valgrind-error.patch from SLEC * Thu Apr 24 2003 ro@suse.de - fix install_info --delete call and move from preun to postun -* Tue Feb 11 2003 mmj@suse.de +* Mon Feb 10 2003 mmj@suse.de - Use %%install_info macro [#23433] * Mon Feb 10 2003 mc@suse.de - switch to version 1.1.12