From 407ab6330ad9f9f495753550d26e2aa4455fa2d7155afdc0cd2abd0d1455efd2 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <ralf@h4kamp.de>
Date: Wed, 24 Oct 2012 14:29:21 +0000
Subject: [PATCH] Accepting request 138291 from
 openSUSE:Factory:Staging:Systemd

- buildrequire krb5-mini in openldap2-client to avoid cycle

OBS-URL: https://build.opensuse.org/request/show/138291
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=89
---
 openldap2-client.changes |  7 +++++++
 openldap2-client.spec    | 12 ++++++------
 openldap2.changes        |  7 +++++++
 openldap2.spec           |  8 ++++----
 pre_checkin.sh           |  3 +++
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/openldap2-client.changes b/openldap2-client.changes
index f0adb6d..d737845 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 16 07:38:01 UTC 2012 - coolo@suse.com
+
+- buildrequire krb5-mini in openldap2-client to avoid cycle
+- move Summary out of the %if as prepare_spec is confused about
+  the license otherwise
+
 -------------------------------------------------------------------
 Thu May 10 09:22:52 UTC 2012 - rhafer@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index cbac78e..a23c30f 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openldap2
+# spec file for package openldap2-client
 #
 # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,8 +18,10 @@
 
 %define run_test_suite 0
 
-Name:         openldap2-client
+Name:           openldap2-client
+Summary:        The OpenLDAP commandline client tools
 License:        OLDAP-2.8
+Group:          Productivity/Networking/LDAP/Clients
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
@@ -43,13 +45,11 @@ BuildRequires:  libdb-4_5-devel
 Conflicts:      openldap
 Requires:       libldap-2_4-2 = %{version}
 PreReq:         %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
-Summary:        The OpenLDAP Server
-Group:          Productivity/Networking/LDAP/Clients
 %else
+# avoid cycle with krb5
+BuildRequires:  krb5-mini
 Conflicts:      openldap-client
 Requires:       libldap-2_4-2 = %{version}
-Summary:        The OpenLDAP commandline client tools
-Group:          Productivity/Networking/LDAP/Clients
 %endif
 Source:         openldap-%{version}.tgz
 Source1:        openldap-rc.tgz
diff --git a/openldap2.changes b/openldap2.changes
index f0adb6d..d737845 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 16 07:38:01 UTC 2012 - coolo@suse.com
+
+- buildrequire krb5-mini in openldap2-client to avoid cycle
+- move Summary out of the %if as prepare_spec is confused about
+  the license otherwise
+
 -------------------------------------------------------------------
 Thu May 10 09:22:52 UTC 2012 - rhafer@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index 039a2e5..4d641ec 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -19,7 +19,9 @@
 %define run_test_suite 0
 
 Name:           openldap2
+Summary:        The OpenLDAP Server
 License:        OLDAP-2.8
+Group:          Productivity/Networking/LDAP/Clients
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
@@ -43,13 +45,11 @@ BuildRequires:  libdb-4_5-devel
 Conflicts:      openldap
 Requires:       libldap-2_4-2 = %{version}
 PreReq:         %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
-Summary:        The OpenLDAP Server
-Group:          Productivity/Networking/LDAP/Clients
 %else
+# avoid cycle with krb5
+BuildRequires:  krb5-mini
 Conflicts:      openldap-client
 Requires:       libldap-2_4-2 = %{version}
-Summary:        The OpenLDAP commandline client tools
-Group:          Productivity/Networking/LDAP/Clients
 %endif
 Source:         openldap-%{version}.tgz
 Source1:        openldap-rc.tgz
diff --git a/pre_checkin.sh b/pre_checkin.sh
index 12ecd0c..fd99223 100644
--- a/pre_checkin.sh
+++ b/pre_checkin.sh
@@ -6,6 +6,9 @@ cp openldap2.changes openldap2-client.changes
 cp openldap2.spec openldap2-client.spec
 
 perl -pi -e "s/^Name:.*openldap2$/Name:         openldap2-client/g"  openldap2-client.spec
+perl -pi -e "s/^Summary:.*Server$/Summary:        The OpenLDAP commandline client tools/" openldap2-client.spec
+
+osc service localrun format_spec_file
 
 echo "Done."