From e483c9e0d73b9bebf4758bbc5e22ef1cfd480dc8239972d7076dc0c31b98468f Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 18 Jun 2013 07:02:31 +0000 Subject: [PATCH] Accepting request 179334 from home:jengelh:dev - For now, avoid automatic use of libdb-6_0 by explicitly selecting libdb-4_8 as BuildRequire. OBS-URL: https://build.opensuse.org/request/show/179334 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=100 --- openldap2-client.changes | 6 ++++++ openldap2-client.spec | 4 ++-- openldap2.changes | 6 ++++++ openldap2.spec | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/openldap2-client.changes b/openldap2-client.changes index a91ee7e..4ac437c 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 17 14:37:45 UTC 2013 - jengelh@inai.de + +- For now, avoid automatic use of libdb-6_0 by explicitly selecting + libdb-4_8 as BuildRequire. + ------------------------------------------------------------------- Mon Mar 25 16:08:21 UTC 2013 - jengelh@inai.de diff --git a/openldap2-client.spec b/openldap2-client.spec index f9143d3..bd9fb8b 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -35,12 +35,12 @@ Version: 2.4.33 Release: 0 Url: http://www.openldap.org %if "%{name}" == "openldap2" -BuildRequires: db-devel +BuildRequires: libdb-4_8-devel BuildRequires: openslp-devel BuildRequires: tcpd-devel BuildRequires: unixODBC-devel %if %sles_version == 10 -BuildRequires: -db-devel +BuildRequires: -libdb-4_8-devel BuildRequires: libdb-4_5-devel %endif Conflicts: openldap diff --git a/openldap2.changes b/openldap2.changes index a91ee7e..4ac437c 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 17 14:37:45 UTC 2013 - jengelh@inai.de + +- For now, avoid automatic use of libdb-6_0 by explicitly selecting + libdb-4_8 as BuildRequire. + ------------------------------------------------------------------- Mon Mar 25 16:08:21 UTC 2013 - jengelh@inai.de diff --git a/openldap2.spec b/openldap2.spec index 6665f4f..52b312e 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -35,12 +35,12 @@ Version: 2.4.33 Release: 0 Url: http://www.openldap.org %if "%{name}" == "openldap2" -BuildRequires: db-devel +BuildRequires: libdb-4_8-devel BuildRequires: openslp-devel BuildRequires: tcpd-devel BuildRequires: unixODBC-devel %if %sles_version == 10 -BuildRequires: -db-devel +BuildRequires: -libdb-4_8-devel BuildRequires: libdb-4_5-devel %endif Conflicts: openldap