From a7a83371b29693409e97cd84758e96215a1c8bfcfecfe1e50798db347e89008c Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 29 Feb 2008 22:33:36 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=20

---
 openldap2-client.changes |  9 +++++++++
 openldap2-client.spec    | 15 +++++++++++----
 openldap2.changes        |  9 +++++++++
 openldap2.spec           | 15 +++++++++++----
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/openldap2-client.changes b/openldap2-client.changes
index 9d6bcd9..22da097 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb 27 11:21:39 CET 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.
+- Removed static libldap_r.a library and libldap_r.so link from 
+  -devel subpackage. External programs should only use the "normal"
+  libldap library.
+
 -------------------------------------------------------------------
 Wed Feb 20 09:49:30 CET 2008 - rhafer@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index c799afb..937acb6 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:        1
+Release:        4
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -202,6 +202,8 @@ 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
@@ -235,6 +237,7 @@ 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*
@@ -266,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.*
@@ -280,8 +283,6 @@ cat > openldap2-devel.filelist <<EOF
 %{_libdir}/liblber.so
 %{_libdir}/libldap.a
 %{_libdir}/libldap.so
-%{_libdir}/libldap_r.a
-%{_libdir}/libldap_r.so
 %doc %{_mandir}/man3/ber*
 %doc %{_mandir}/man3/lber*
 %doc %{_mandir}/man3/ld_errno*
@@ -348,6 +349,12 @@ fi
 %endif
 
 %changelog
+* 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.
+- Removed static libldap_r.a library and libldap_r.so link from
+  -devel subpackage. External programs should only use the "normal"
+  libldap library.
 * Wed Feb 20 2008 rhafer@suse.de
 - Update to Version 2.4.8. Most important changes:
   * Fixed libldap extended decoding (ITS#5304)
diff --git a/openldap2.changes b/openldap2.changes
index 9d6bcd9..22da097 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb 27 11:21:39 CET 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.
+- Removed static libldap_r.a library and libldap_r.so link from 
+  -devel subpackage. External programs should only use the "normal"
+  libldap library.
+
 -------------------------------------------------------------------
 Wed Feb 20 09:49:30 CET 2008 - rhafer@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index b0c7eff..0516e6d 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -29,7 +29,7 @@ Summary:        The OpenLDAP Server
 %endif
 AutoReqProv:    on
 Version:        2.4.8
-Release:        1
+Release:        4
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -205,6 +205,8 @@ 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
@@ -238,6 +240,7 @@ 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 +272,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.*
@@ -283,8 +286,6 @@ cat > openldap2-devel.filelist <<EOF
 %{_libdir}/liblber.so
 %{_libdir}/libldap.a
 %{_libdir}/libldap.so
-%{_libdir}/libldap_r.a
-%{_libdir}/libldap_r.so
 %doc %{_mandir}/man3/ber*
 %doc %{_mandir}/man3/lber*
 %doc %{_mandir}/man3/ld_errno*
@@ -351,6 +352,12 @@ fi
 %endif
 
 %changelog
+* 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.
+- Removed static libldap_r.a library and libldap_r.so link from
+  -devel subpackage. External programs should only use the "normal"
+  libldap library.
 * Wed Feb 20 2008 rhafer@suse.de
 - Update to Version 2.4.8. Most important changes:
   * Fixed libldap extended decoding (ITS#5304)