From 0dd312b017fc99c2f456e57585366c05e59aaeff0f865969f9274cc4c9937940 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 3 Mar 2008 15:20:00 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=21

---
 openldap2-client.changes |  7 +++++++
 openldap2-client.spec    | 15 ++++++++-------
 openldap2.changes        |  7 +++++++
 openldap2.spec           | 15 ++++++++-------
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/openldap2-client.changes b/openldap2-client.changes
index 22da097..2534c47 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar  3 08:50:18 CET 2008 - rhafer@suse.de
+
+- revert last change and make libldap_r available again as some
+  packages seem to directly rely on libldap_r. Assume they know 
+  of the libldap_r's limitations.
+
 -------------------------------------------------------------------
 Wed Feb 27 11:21:39 CET 2008 - rhafer@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index 937acb6..83e6c5a 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -29,7 +29,7 @@ Summary:        OpenLDAP Client Utilities
 %endif
 AutoReqProv:    on
 Version:        2.4.8
-Release:        4
+Release:        6
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -202,8 +202,6 @@ rm -rf doc/guide/release
 rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example
 rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example
 %endif
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libldap_r.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so
 rm -f $RPM_BUILD_ROOT/usr/lib/openldap/modules/*.a
 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-dnssrv.5
 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-null.5
@@ -237,7 +235,6 @@ cat >openldap2.filelist <<EOF
 %dir /usr/lib/openldap
 %dir /usr/lib/openldap/modules
 /usr/lib/openldap/slapd
-%{_libdir}/libldap_r-*.so.*
 %dir %attr(0700, ldap, ldap) /var/lib/ldap
 %dir %attr(0700, ldap, ldap) /var/run/slapd
 %doc %{_mandir}/man8/sl*
@@ -269,7 +266,7 @@ cat > openldap2-client.filelist <<EOF
 /usr/bin/ldappasswd
 /usr/bin/ldapwhoami
 %{_libdir}/liblber*.so.*
-%{_libdir}/libldap-*.so.*
+%{_libdir}/libldap*.so.*
 %doc %{_mandir}/man1/ldap*
 %doc %{_mandir}/man5/ldap.conf*
 %doc %{_mandir}/man5/ldif.*
@@ -281,8 +278,8 @@ cat > openldap2-devel.filelist <<EOF
 /usr/include/slapi-plugin.h
 %{_libdir}/liblber.a
 %{_libdir}/liblber.so
-%{_libdir}/libldap.a
-%{_libdir}/libldap.so
+%{_libdir}/libldap*.a
+%{_libdir}/libldap*.so
 %doc %{_mandir}/man3/ber*
 %doc %{_mandir}/man3/lber*
 %doc %{_mandir}/man3/ld_errno*
@@ -349,6 +346,10 @@ fi
 %endif
 
 %changelog
+* Mon Mar 03 2008 rhafer@suse.de
+- revert last change and make libldap_r available again as some
+  packages seem to directly rely on libldap_r. Assume they know
+  of the libldap_r's limitations.
 * Wed Feb 27 2008 rhafer@suse.de
 - Moved libldap_r from -client subpackage to the main server
   package as it is only meant to be used by slapd.
diff --git a/openldap2.changes b/openldap2.changes
index 22da097..2534c47 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar  3 08:50:18 CET 2008 - rhafer@suse.de
+
+- revert last change and make libldap_r available again as some
+  packages seem to directly rely on libldap_r. Assume they know 
+  of the libldap_r's limitations.
+
 -------------------------------------------------------------------
 Wed Feb 27 11:21:39 CET 2008 - rhafer@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index 0516e6d..52452fd 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -29,7 +29,7 @@ Summary:        The OpenLDAP Server
 %endif
 AutoReqProv:    on
 Version:        2.4.8
-Release:        4
+Release:        6
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -205,8 +205,6 @@ rm -rf doc/guide/release
 rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example
 rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example
 %endif
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libldap_r.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so
 rm -f $RPM_BUILD_ROOT/usr/lib/openldap/modules/*.a
 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-dnssrv.5
 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-null.5
@@ -240,7 +238,6 @@ cat >openldap2.filelist <<EOF
 %dir /usr/lib/openldap
 %dir /usr/lib/openldap/modules
 /usr/lib/openldap/slapd
-%{_libdir}/libldap_r-*.so.*
 %dir %attr(0700, ldap, ldap) /var/lib/ldap
 %dir %attr(0700, ldap, ldap) /var/run/slapd
 %doc %{_mandir}/man8/sl*
@@ -272,7 +269,7 @@ cat > openldap2-client.filelist <<EOF
 /usr/bin/ldappasswd
 /usr/bin/ldapwhoami
 %{_libdir}/liblber*.so.*
-%{_libdir}/libldap-*.so.*
+%{_libdir}/libldap*.so.*
 %doc %{_mandir}/man1/ldap*
 %doc %{_mandir}/man5/ldap.conf*
 %doc %{_mandir}/man5/ldif.*
@@ -284,8 +281,8 @@ cat > openldap2-devel.filelist <<EOF
 /usr/include/slapi-plugin.h
 %{_libdir}/liblber.a
 %{_libdir}/liblber.so
-%{_libdir}/libldap.a
-%{_libdir}/libldap.so
+%{_libdir}/libldap*.a
+%{_libdir}/libldap*.so
 %doc %{_mandir}/man3/ber*
 %doc %{_mandir}/man3/lber*
 %doc %{_mandir}/man3/ld_errno*
@@ -352,6 +349,10 @@ fi
 %endif
 
 %changelog
+* Mon Mar 03 2008 rhafer@suse.de
+- revert last change and make libldap_r available again as some
+  packages seem to directly rely on libldap_r. Assume they know
+  of the libldap_r's limitations.
 * Wed Feb 27 2008 rhafer@suse.de
 - Moved libldap_r from -client subpackage to the main server
   package as it is only meant to be used by slapd.