From 49979cff2e39245436f07e9885a6ee7a5cc9bae5b7ab1e0a2c3da69a86ff7099 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <ralf@h4kamp.de>
Date: Fri, 14 Jun 2013 06:43:36 +0000
Subject: [PATCH] Accepting request 177942 from
 home:jengelh:branches:network:ldap

- Put static libs into openldap2-devel-static and relieve
  openldap2-devel of static-only deps

OBS-URL: https://build.opensuse.org/request/show/177942
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=98
---
 openldap2-client.changes | 11 +++++++++++
 openldap2-client.spec    | 31 +++++++++++++++++++++++--------
 openldap2.changes        |  6 ++++++
 openldap2.spec           | 31 +++++++++++++++++++++++--------
 4 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/openldap2-client.changes b/openldap2-client.changes
index cdb5cb8..a91ee7e 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Mar 25 16:08:21 UTC 2013 - jengelh@inai.de
+
+- Put static libs into openldap2-devel-static and relieve
+  openldap2-devel of static-only deps
+
+-------------------------------------------------------------------
+Sat Nov 17 12:06:23 CET 2012 - ro@suse.de
+
+- fix check-build.sh for kernel > 3.0 
+
 -------------------------------------------------------------------
 Fri Nov 16 09:52:42 UTC 2012 - rhafer@suse.com
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index 481f334..f9143d3 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openldap2-client
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -137,17 +137,26 @@ Obsoletes:      openldap2-devel-64bit
 %endif
 #
 Conflicts:      openldap-devel
+Requires:       libldap-2_4-2 = %{version}
+
+%description -n openldap2-devel
+This package provides the OpenLDAP libraries, header files, and
+documentation.
+
+%package -n openldap2-devel-static
+Summary:        Static libraries for the OpenLDAP libraries
+Group:          Development/Libraries/C and C++
+Requires:       openldap2-devel = %version
 %if %sles_version == 10
 Requires:       openssl-devel
 %else
 Requires:       libopenssl-devel
 %endif
 Requires:       cyrus-sasl-devel
-Requires:       libldap-2_4-2 = %{version}
 
-%description -n openldap2-devel
-This package provides the OpenLDAP libraries, header files, and
-documentation.
+%description -n openldap2-devel-static
+This package provides the static versions of the OpenLDAP libraries
+for development.
 
 %package      -n libldap-2_4-2
 Summary:        OpenLDAP Client Libraries
@@ -413,15 +422,17 @@ cat > libldap.filelist <<EOF
 EOF
 cat > openldap2-devel.filelist <<EOF
 /usr/include/*.h
-%{_libdir}/liblber.a
 %{_libdir}/liblber.so
-%{_libdir}/libldap*.a
 %{_libdir}/libldap*.so
 %doc %{_mandir}/man3/ber*
 %doc %{_mandir}/man3/lber*
 %doc %{_mandir}/man3/ld_errno*
 %doc %{_mandir}/man3/ldap*
 EOF
+cat > openldap2-devel-static.filelist <<-EOF
+	%_libdir/liblber.a
+	%_libdir/libldap*.a
+EOF
 cat > openldap2-back-perl.filelist <<EOF
 /usr/lib/openldap/modules/back_perl*
 %doc %{_mandir}/man5/slapd-perl.*
@@ -445,7 +456,8 @@ cat >openldap2-doc.filelist <<EOF
 EOF
 #remove files from other spec file
 %if "%{name}" == "openldap2"
-cat openldap2-client.filelist libldap.filelist openldap2-devel.filelist |
+cat openldap2-client.filelist libldap.filelist openldap2-devel.filelist \
+	openldap2-devel-static.filelist |
 %else
 cat openldap2.filelist openldap2-back-perl.filelist \
     openldap2-back-meta.filelist openldap2-back-sql.filelist \
@@ -516,6 +528,9 @@ fi
 
 %files -n openldap2-devel -f openldap2-devel.filelist
 %defattr(-,root,root)
+
+%files -n openldap2-devel-static -f openldap2-devel-static.filelist
+%defattr(-,root,root)
 %endif
 
 %changelog
diff --git a/openldap2.changes b/openldap2.changes
index 9de4958..a91ee7e 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 25 16:08:21 UTC 2013 - jengelh@inai.de
+
+- Put static libs into openldap2-devel-static and relieve
+  openldap2-devel of static-only deps
+
 -------------------------------------------------------------------
 Sat Nov 17 12:06:23 CET 2012 - ro@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index 5b84cc5..6665f4f 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openldap2
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -137,17 +137,26 @@ Obsoletes:      openldap2-devel-64bit
 %endif
 #
 Conflicts:      openldap-devel
+Requires:       libldap-2_4-2 = %{version}
+
+%description -n openldap2-devel
+This package provides the OpenLDAP libraries, header files, and
+documentation.
+
+%package -n openldap2-devel-static
+Summary:        Static libraries for the OpenLDAP libraries
+Group:          Development/Libraries/C and C++
+Requires:       openldap2-devel = %version
 %if %sles_version == 10
 Requires:       openssl-devel
 %else
 Requires:       libopenssl-devel
 %endif
 Requires:       cyrus-sasl-devel
-Requires:       libldap-2_4-2 = %{version}
 
-%description -n openldap2-devel
-This package provides the OpenLDAP libraries, header files, and
-documentation.
+%description -n openldap2-devel-static
+This package provides the static versions of the OpenLDAP libraries
+for development.
 
 %package      -n libldap-2_4-2
 Summary:        OpenLDAP Client Libraries
@@ -413,15 +422,17 @@ cat > libldap.filelist <<EOF
 EOF
 cat > openldap2-devel.filelist <<EOF
 /usr/include/*.h
-%{_libdir}/liblber.a
 %{_libdir}/liblber.so
-%{_libdir}/libldap*.a
 %{_libdir}/libldap*.so
 %doc %{_mandir}/man3/ber*
 %doc %{_mandir}/man3/lber*
 %doc %{_mandir}/man3/ld_errno*
 %doc %{_mandir}/man3/ldap*
 EOF
+cat > openldap2-devel-static.filelist <<-EOF
+	%_libdir/liblber.a
+	%_libdir/libldap*.a
+EOF
 cat > openldap2-back-perl.filelist <<EOF
 /usr/lib/openldap/modules/back_perl*
 %doc %{_mandir}/man5/slapd-perl.*
@@ -445,7 +456,8 @@ cat >openldap2-doc.filelist <<EOF
 EOF
 #remove files from other spec file
 %if "%{name}" == "openldap2"
-cat openldap2-client.filelist libldap.filelist openldap2-devel.filelist |
+cat openldap2-client.filelist libldap.filelist openldap2-devel.filelist \
+	openldap2-devel-static.filelist |
 %else
 cat openldap2.filelist openldap2-back-perl.filelist \
     openldap2-back-meta.filelist openldap2-back-sql.filelist \
@@ -516,6 +528,9 @@ fi
 
 %files -n openldap2-devel -f openldap2-devel.filelist
 %defattr(-,root,root)
+
+%files -n openldap2-devel-static -f openldap2-devel-static.filelist
+%defattr(-,root,root)
 %endif
 
 %changelog