diff --git a/gnutls.changes b/gnutls.changes index 2fc60c0..abb5beb 100644 --- a/gnutls.changes +++ b/gnutls.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 30 12:34:56 CET 2008 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + ------------------------------------------------------------------- Sat Aug 2 10:28:21 CEST 2008 - meissner@suse.de diff --git a/gnutls.spec b/gnutls.spec index 0118cb0..8c4ffdd 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -2,9 +2,16 @@ # spec file for package gnutls (Version 2.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/ # @@ -14,7 +21,7 @@ Name: gnutls BuildRequires: gcc-c++ libgcrypt-devel libopencdk-devel Version: 2.4.1 -Release: 5 +Release: 22 License: GPL v3 or later; LGPL v2.1 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.gnutls.org/ @@ -23,6 +30,14 @@ Patch1: gnutls-2.4.1-disable_cxx.patch Summary: The GNU Transport Layer Security Library Group: Productivity/Networking/Security AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: gnutls-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: gnutls-32bit +%endif +# %description The GnuTLS project aims to develop a library that provides a secure @@ -103,6 +118,14 @@ Requires: libgnutls-extra26 = %version libgnutls-devel # gnutls-devel last used in 10.3 Obsoletes: gnutls-devel < %version Provides: gnutls-devel = %version +# bug437293 +%ifarch ppc64 +Obsoletes: gnutls-devel-64bit +%endif +%ifarch %ix86 ppc +Obsoletes: gnutls-devel-32bit +%endif +# %description -n libgnutls-extra-devel The GnuTLS project aims to develop a library that provides a secure @@ -207,6 +230,8 @@ rm -rf %buildroot %_libdir/pkgconfig/gnutls-extra.pc %changelog +* Thu Oct 30 2008 olh@suse.de +- obsolete old -XXbit packages (bnc#437293) * Sat Aug 02 2008 meissner@suse.de - run testsuite * Thu Jul 17 2008 mkoenig@suse.de