From df5ff97b5c00b944a6d153d3273f562e1cf9acda7a73e402484a44a046782aa8 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 15 Apr 2010 08:47:07 +0000 Subject: [PATCH] Accepting request 37974 from home:adrianSuSE:branches:network:ldap Copy from home:adrianSuSE:branches:network:ldap/openldap2 based on submit request 37974 from user adrianSuSE OBS-URL: https://build.opensuse.org/request/show/37974 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=62 --- openldap2-client.changes | 5 +++++ openldap2-client.spec | 5 +++-- openldap2.changes | 5 +++++ openldap2.spec | 5 +++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/openldap2-client.changes b/openldap2-client.changes index ba6a1fe..5c74b6e 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 15 08:18:49 UTC 2010 - adrian@suse.de + +- fix build dependency cycle for -client package with openslp + ------------------------------------------------------------------- Wed Mar 17 13:06:12 UTC 2010 - rhafer@novell.com diff --git a/openldap2-client.spec b/openldap2-client.spec index c9c04be..82ea6f1 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -20,7 +20,7 @@ %define run_test_suite 1 Name: openldap2-client -BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel +BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel tcpd-devel %if %sles_version == 9 BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif @@ -28,10 +28,11 @@ BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-de BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif Version: 2.4.21 -Release: 3 +Release: 4 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 %if "%{name}" == "openldap2" +BuildRequires: openslp-devel Group: Productivity/Networking/LDAP/Clients Conflicts: openldap Requires: libldap-2_4-2 = %{version} diff --git a/openldap2.changes b/openldap2.changes index ba6a1fe..5c74b6e 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 15 08:18:49 UTC 2010 - adrian@suse.de + +- fix build dependency cycle for -client package with openslp + ------------------------------------------------------------------- Wed Mar 17 13:06:12 UTC 2010 - rhafer@novell.com diff --git a/openldap2.spec b/openldap2.spec index c4726f8..9ea5628 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -20,7 +20,7 @@ %define run_test_suite 1 Name: openldap2 -BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel +BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel tcpd-devel %if %sles_version == 9 BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif @@ -28,10 +28,11 @@ BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-de BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif Version: 2.4.21 -Release: 3 +Release: 4 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 %if "%{name}" == "openldap2" +BuildRequires: openslp-devel Group: Productivity/Networking/LDAP/Clients Conflicts: openldap Requires: libldap-2_4-2 = %{version}