From b1c8583981c399c914600961fde9b646aff9d94a Mon Sep 17 00:00:00 2001
From: Jan Šafránek <jsafrane@fedoraproject.org>
Date: Oct 24 2007 12:21:36 +0000
Subject: fixed multilib issues - all platform independent files have the same content now

Resolves: #342791

---

diff --git a/openldap-2.3.34-config.patch b/openldap-2.3.34-config.patch
index 58f5d63..f3cf63d 100644
--- a/openldap-2.3.34-config.patch
+++ b/openldap-2.3.34-config.patch
@@ -23,7 +23,8 @@
 +argsfile	%LOCALSTATEDIR%/run/openldap/slapd.args
  
  # Load dynamic backend modules:
- # modulepath	%MODULEDIR%
+-# modulepath	%MODULEDIR%
++# modulepath	/usr/lib/openldap # or /usr/lib64/openldap
 -# moduleload	back_bdb.la
 -# moduleload	back_ldap.la
 -# moduleload	back_ldbm.la
diff --git a/openldap-2.3.38-multilib.patch b/openldap-2.3.38-multilib.patch
new file mode 100644
index 0000000..a375c80
--- /dev/null
+++ b/openldap-2.3.38-multilib.patch
@@ -0,0 +1,69 @@
+diff -up openldap-2.3.38/doc/man/man8/slurpd.8.orig openldap-2.3.38/doc/man/man8/slurpd.8
+--- openldap-2.3.38/doc/man/man8/slurpd.8.orig	2007-01-02 22:43:46.000000000 +0100
++++ openldap-2.3.38/doc/man/man8/slurpd.8	2007-10-23 15:03:25.000000000 +0200
+@@ -5,7 +5,7 @@
+ .SH NAME
+ slurpd \- Standalone LDAP Update Replication Daemon
+ .SH SYNOPSIS
+-.B LIBEXECDIR/slurpd [\-d debug\-level]
++.B slurpd [\-d debug\-level]
+ .B [\-f slapd\-config\-file] [\-r slapd\-replog\-file]
+ .B [\-t temp\-dir] [\-o]
+ .B 
+@@ -131,7 +131,7 @@ just type:
+ .LP
+ .nf
+ .ft tt
+-	LIBEXECDIR/slurpd
++	slurpd
+ .ft
+ .fi
+ .LP
+@@ -144,7 +144,7 @@ on voluminous debugging which will be pr
+ .LP
+ .nf
+ .ft tt
+-	LIBEXECDIR/slurpd -f ETCDIR/slapd.conf -d 255
++	slurpd -f ETCDIR/slapd.conf -d 255
+ .ft
+ .fi
+ .LP
+diff -up openldap-2.3.38/doc/man/man8/slapd.8.orig openldap-2.3.38/doc/man/man8/slapd.8
+--- openldap-2.3.38/doc/man/man8/slapd.8.orig	2007-01-02 22:43:46.000000000 +0100
++++ openldap-2.3.38/doc/man/man8/slapd.8	2007-10-23 15:03:13.000000000 +0200
+@@ -5,7 +5,7 @@
+ .SH NAME
+ slapd \- Stand-alone LDAP Daemon
+ .SH SYNOPSIS
+-.B LIBEXECDIR/slapd 
++.B slapd 
+ .B [\-[4|6]]
+ .B [\-T {acl|add|auth|cat|dn|index|passwd|test}]
+ .B [\-d debug\-level]
+@@ -234,7 +234,7 @@ the LDAP databases defined in the defaul
+ .LP
+ .nf
+ .ft tt
+-	LIBEXECDIR/slapd
++	slapd
+ .ft
+ .fi
+ .LP
+@@ -245,7 +245,7 @@ on voluminous debugging which will be pr
+ .LP
+ .nf
+ .ft tt
+-	LIBEXECDIR/slapd -f /var/tmp/slapd.conf -d 255
++	slapd -f /var/tmp/slapd.conf -d 255
+ .ft
+ .fi
+ .LP
+@@ -253,7 +253,7 @@ To test whether the configuration file i
+ .LP
+ .nf
+ .ft tt
+-	LIBEXECDIR/slapd -Tt
++	slapd -Tt
+ .ft
+ .fi
+ .LP
diff --git a/openldap.spec b/openldap.spec
index 1c6a6ea..8ac8dc1 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -12,7 +12,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -38,6 +38,7 @@ Patch6: openldap-2.3.19-gethostbyXXXX_r.patch
 Patch7: openldap-2.3.34-quiet-slaptest.patch
 Patch8: openldap-2.3.34-pthread.patch
 Patch9: openldap-2.3.37-smbk5pwd.patch
+Patch10: openldap-2.3.38-multilib.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -172,6 +173,7 @@ pushd openldap-%{version_23}
 %patch7 -p1 -b .quiet-slaptest
 %patch8 -p1 -b .pthread
 %patch9 -p1 -b .smbk5pwd
+%patch10 -p1 -b .multilib
 
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
@@ -674,6 +676,10 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue Oct 23 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-4%{?dist}
+- fixed multilib issues - all platform independent files have the
+  same content now (#342791)
+
 * Thu Oct  4 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-3%{?dist}
 - BDB downgraded back to 4.4.20 because 4.6.18 is not supported by 
   openldap (#314821)