From ce208a426b2b7b1dbd269db819e9f403fbf8178a762812f6287ed687d706b6e6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 9 Jan 2009 00:42:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=46 --- openldap2-client.changes | 5 +++++ openldap2-client.spec | 11 +++++++++-- openldap2.changes | 5 +++++ openldap2.spec | 11 +++++++++-- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/openldap2-client.changes b/openldap2-client.changes index ccaef19..7932584 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 7 12:34:56 CET 2009 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + ------------------------------------------------------------------- Fri Dec 12 14:45:07 CET 2008 - rhafer@suse.de diff --git a/openldap2-client.spec b/openldap2-client.spec index 73bd2b1..4dd9d6f 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,7 +1,7 @@ # # spec file for package openldap2-client (Version 2.4.12) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ BuildRequires: -libopenssl-devel -pwdutils openssl-devel BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif Version: 2.4.12 -Release: 6 +Release: 7 Url: http://www.openldap.org License: BSD 3-Clause %if "%{name}" == "openldap2" @@ -126,6 +126,11 @@ Authors: License: BSD 3-Clause; openldap 2.8 Summary: Libraries, Header Files and Documentation for OpenLDAP AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: openldap2-devel-64bit +%endif +# Conflicts: openldap-devel Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel libopenssl-devel Group: Development/Libraries/C and C++ @@ -540,6 +545,8 @@ fi %endif %changelog +* Wed Jan 07 2009 olh@suse.de +- obsolete old -XXbit packages (bnc#437293) * Fri Dec 12 2008 rhafer@suse.de - Fixed openldap2-devel dependencies (bnc#457989) * Tue Dec 09 2008 rhafer@suse.de diff --git a/openldap2.changes b/openldap2.changes index ccaef19..7932584 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 7 12:34:56 CET 2009 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + ------------------------------------------------------------------- Fri Dec 12 14:45:07 CET 2008 - rhafer@suse.de diff --git a/openldap2.spec b/openldap2.spec index 846bb84..d15698d 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -1,7 +1,7 @@ # # spec file for package openldap2 (Version 2.4.12) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ BuildRequires: -libopenssl-devel -pwdutils openssl-devel BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif Version: 2.4.12 -Release: 6 +Release: 7 Url: http://www.openldap.org License: BSD 3-Clause; openldap 2.8 %if "%{name}" == "openldap2" @@ -129,6 +129,11 @@ Authors: License: BSD 3-Clause; openldap 2.8 Summary: Libraries, Header Files and Documentation for OpenLDAP AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: openldap2-devel-64bit +%endif +# Conflicts: openldap-devel Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel libopenssl-devel Group: Development/Libraries/C and C++ @@ -543,6 +548,8 @@ fi %endif %changelog +* Wed Jan 07 2009 olh@suse.de +- obsolete old -XXbit packages (bnc#437293) * Fri Dec 12 2008 rhafer@suse.de - Fixed openldap2-devel dependencies (bnc#457989) * Tue Dec 09 2008 rhafer@suse.de