From 59a37d3a2c55873cfab7d638274571931e11b20a5a69a9715fa36df32dcb9c8f Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 25 Jun 2008 16:32:44 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=29

---
 baselibs.conf            |  6 ++++--
 openldap2-client.changes |  6 ++++++
 openldap2-client.spec    | 39 +++++++++++++++++++++++++++++++--------
 openldap2.changes        |  6 ++++++
 openldap2.spec           | 39 +++++++++++++++++++++++++++++++--------
 5 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index acf38d3..3b434dc 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,4 +1,6 @@
-openldap2-client
+libldap-2_4-2
+  provides "openldap2-client-<targettype> = <version>"
+  obsoletes "openldap2-client-<targettype> <= <version>"
 openldap2-devel
   requires -openldap2-<targettype>
-  requires "openldap2-client-<targettype> = <version>"
+  requires "libldap-2_4-2-<targettype> = <version>"
diff --git a/openldap2-client.changes b/openldap2-client.changes
index 6cbc2f5..18eae5f 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 24 11:08:00 CEST 2008 - rhafer@suse.de
+
+- branched off libldap-2_4-2 package to support the shared library
+  packaging policy
+
 -------------------------------------------------------------------
 Wed Jun 11 13:03:29 CEST 2008 - rhafer@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index c605112..a905a0b 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -29,7 +29,7 @@ Summary:        OpenLDAP Client Utilities
 %endif
 AutoReqProv:    on
 Version:        2.4.10
-Release:        1
+Release:        2
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -100,8 +100,8 @@ Authors:
 License:        BSD 3-Clause; openldap 2.8
 Summary:        Libraries, Header Files and Documentation for OpenLDAP
 AutoReqProv:    on
-Conflicts:      openldap-devel 
-Requires:       openldap2-client = %{version}  cyrus-sasl-devel openssl-devel
+Conflicts:      openldap-devel
+Requires:       libldap-2_4-2 = %{version}  cyrus-sasl-devel openssl-devel
 Group:          Development/Libraries/C and C++
 
 %description -n openldap2-devel
@@ -110,6 +110,21 @@ documentation.
 
 
 
+Authors:
+--------
+    The OpenLDAP Project <project@openldap.org>
+
+%package      -n libldap-2_4-2
+License:        BSD 3-Clause
+Summary:        OpenLDAP Client Libraries
+AutoReqProv:    on
+Group:          Productivity/Networking/LDAP/Clients
+
+%description -n libldap-2_4-2
+This package contains the OpenLDAP client libraries.
+
+
+
 Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
@@ -292,12 +307,14 @@ cat > openldap2-client.filelist <<EOF
 /usr/bin/ldapsearch
 /usr/bin/ldappasswd
 /usr/bin/ldapwhoami
-%{_libdir}/liblber*.so.*
-%{_libdir}/libldap*.so.*
 %doc %{_mandir}/man1/ldap*
 %doc %{_mandir}/man5/ldap.conf*
 %doc %{_mandir}/man5/ldif.*
 EOF
+cat > libldap.filelist <<EOF
+%{_libdir}/liblber*.so.*
+%{_libdir}/libldap*.so.*
+EOF
 cat > openldap2-devel.filelist <<EOF
 /usr/include/lber.h
 /usr/include/lber_types.h
@@ -322,7 +339,7 @@ cat > openldap2-back-meta.filelist <<EOF
 EOF
 #remove files from other spec file
 %if "%{name}" == "openldap2"
-cat openldap2-client.filelist openldap2-devel.filelist |    
+cat openldap2-client.filelist libldap.filelist openldap2-devel.filelist |    
 %else
 cat openldap2.filelist openldap2-back-perl.filelist openldap2-back-meta.filelist |
 %endif
@@ -434,18 +451,24 @@ fi
 %defattr(-,root,root)
 %else
 
-%post -p /sbin/ldconfig
+%post -n libldap-2_4-2 -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n libldap-2_4-2 -p /sbin/ldconfig
 
 %files -f openldap2-client.filelist
 %defattr(-,root,root)
 
+%files -n libldap-2_4-2 -f libldap.filelist
+%defattr(-,root,root)
+
 %files -n openldap2-devel -f openldap2-devel.filelist
 %defattr(-,root,root)
 %endif
 
 %changelog
+* Tue Jun 24 2008 rhafer@suse.de
+- branched off libldap-2_4-2 package to support the shared library
+  packaging policy
 * Wed Jun 11 2008 rhafer@suse.de
 - Update to Version 2.4.10. Most important changes:
   * Fixed libldap ld_defconn cleanup if it was freed (ITS#5518,
diff --git a/openldap2.changes b/openldap2.changes
index 6cbc2f5..18eae5f 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 24 11:08:00 CEST 2008 - rhafer@suse.de
+
+- branched off libldap-2_4-2 package to support the shared library
+  packaging policy
+
 -------------------------------------------------------------------
 Wed Jun 11 13:03:29 CEST 2008 - rhafer@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index 140b650..e9eb005 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -29,7 +29,7 @@ Summary:        The OpenLDAP Server
 %endif
 AutoReqProv:    on
 Version:        2.4.10
-Release:        1
+Release:        2
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -103,8 +103,8 @@ Authors:
 License:        BSD 3-Clause; openldap 2.8
 Summary:        Libraries, Header Files and Documentation for OpenLDAP
 AutoReqProv:    on
-Conflicts:      openldap-devel 
-Requires:       openldap2-client = %{version}  cyrus-sasl-devel openssl-devel
+Conflicts:      openldap-devel
+Requires:       libldap-2_4-2 = %{version}  cyrus-sasl-devel openssl-devel
 Group:          Development/Libraries/C and C++
 
 %description -n openldap2-devel
@@ -113,6 +113,21 @@ documentation.
 
 
 
+Authors:
+--------
+    The OpenLDAP Project <project@openldap.org>
+
+%package      -n libldap-2_4-2
+License:        BSD 3-Clause
+Summary:        OpenLDAP Client Libraries
+AutoReqProv:    on
+Group:          Productivity/Networking/LDAP/Clients
+
+%description -n libldap-2_4-2
+This package contains the OpenLDAP client libraries.
+
+
+
 Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
@@ -295,12 +310,14 @@ cat > openldap2-client.filelist <<EOF
 /usr/bin/ldapsearch
 /usr/bin/ldappasswd
 /usr/bin/ldapwhoami
-%{_libdir}/liblber*.so.*
-%{_libdir}/libldap*.so.*
 %doc %{_mandir}/man1/ldap*
 %doc %{_mandir}/man5/ldap.conf*
 %doc %{_mandir}/man5/ldif.*
 EOF
+cat > libldap.filelist <<EOF
+%{_libdir}/liblber*.so.*
+%{_libdir}/libldap*.so.*
+EOF
 cat > openldap2-devel.filelist <<EOF
 /usr/include/lber.h
 /usr/include/lber_types.h
@@ -325,7 +342,7 @@ cat > openldap2-back-meta.filelist <<EOF
 EOF
 #remove files from other spec file
 %if "%{name}" == "openldap2"
-cat openldap2-client.filelist openldap2-devel.filelist |    
+cat openldap2-client.filelist libldap.filelist openldap2-devel.filelist |    
 %else
 cat openldap2.filelist openldap2-back-perl.filelist openldap2-back-meta.filelist |
 %endif
@@ -437,18 +454,24 @@ fi
 %defattr(-,root,root)
 %else
 
-%post -p /sbin/ldconfig
+%post -n libldap-2_4-2 -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n libldap-2_4-2 -p /sbin/ldconfig
 
 %files -f openldap2-client.filelist
 %defattr(-,root,root)
 
+%files -n libldap-2_4-2 -f libldap.filelist
+%defattr(-,root,root)
+
 %files -n openldap2-devel -f openldap2-devel.filelist
 %defattr(-,root,root)
 %endif
 
 %changelog
+* Tue Jun 24 2008 rhafer@suse.de
+- branched off libldap-2_4-2 package to support the shared library
+  packaging policy
 * Wed Jun 11 2008 rhafer@suse.de
 - Update to Version 2.4.10. Most important changes:
   * Fixed libldap ld_defconn cleanup if it was freed (ITS#5518,