Author: coudot
Date: 2010-03-29 17:19:42 +0200 (Mon, 29 Mar 2010)
New Revision: 62
Modified:
openldap-rpm/trunk/SPECS/berkeleydb-ltb.spec
openldap-rpm/trunk/SPECS/openldap-ltb.spec
Log:
Apply patch from David Mocuhoir to support x86_64 compilation
Modified: openldap-rpm/trunk/SPECS/berkeleydb-ltb.spec
===================================================================
--- openldap-rpm/trunk/SPECS/berkeleydb-ltb.spec 2010-03-26 06:06:38 UTC
(rev 61)
+++ openldap-rpm/trunk/SPECS/berkeleydb-ltb.spec 2010-03-29 15:19:42 UTC
(rev 62)
@@ -69,7 +69,7 @@
%build
cd build_unix
export CC=gcc
-../dist/configure --prefix=%{bdbdir}
+../dist/configure --prefix=%{bdbdir} --libdir=%{bdbdir}/%{_lib}
make %{?_smp_mflags}
#=================================================
@@ -93,7 +93,7 @@
if [ $1 -eq 1 ]
then
# Add BerkeleyDB libraries to the system
- echo "%{bdbdir}/lib" >> /etc/ld.so.conf
+ echo "%{bdbdir}/%{_lib}" >> /etc/ld.so.conf
/sbin/ldconfig
fi
@@ -105,7 +105,7 @@
if [ $1 -eq 0 ]
then
# Remove BerkeleyDB libraries from the system
- sed -i '\:'%{bdbdir}/lib':d' /etc/ld.so.conf
+ sed -i '\:'%{bdbdir}/%{_lib}':d' /etc/ld.so.conf
/sbin/ldconfig
fi
@@ -118,7 +118,7 @@
%dir %{bdbdir}
%{bdbdir}/bin
%{bdbdir}/include
-%{bdbdir}/lib
+%{bdbdir}/%{_lib}
/etc/profile.d/berkeleydb.sh
#=================================================
Modified: openldap-rpm/trunk/SPECS/openldap-ltb.spec
===================================================================
--- openldap-rpm/trunk/SPECS/openldap-ltb.spec 2010-03-26 06:06:38 UTC (rev 61)
+++ openldap-rpm/trunk/SPECS/openldap-ltb.spec 2010-03-29 15:19:42 UTC (rev 62)
@@ -126,8 +126,8 @@
export CC="gcc"
export CFLAGS="-DOPENLDAP_FD_SETSIZE=4096 -O2 -g"
export CPPFLAGS="-I%{bdbdir}/include -I/usr/kerberos/include"
-export LDFLAGS="-L%{bdbdir}/lib"
-./configure --enable-ldap --enable-debug --prefix=%{ldapserverdir} --with-tls
--with-cyrus-sasl --enable-spasswd --enable-overlays --enable-modules
+export LDFLAGS="-L%{bdbdir}/%{_lib}"
+./configure --enable-ldap --enable-debug --prefix=%{ldapserverdir}
--libdir=%{ldapserverdir}/%{_lib} --with-tls --with-cyrus-sasl --enable-spasswd
--enable-overlays --enable-modules
make depend
make %{?_smp_mflags}
# check_password
@@ -175,7 +175,7 @@
sed -i 's:^directory.*:directory\t'%{ldapdatadir}':'
%{buildroot}%{ldapserverdir}/etc/openldap/slapd.conf
# check_password
-install -m 644
%{check_password_name}-%{check_password_version}/check_password.so
%{buildroot}%{ldapserverdir}/lib
+install -m 644
%{check_password_name}-%{check_password_version}/check_password.so
%{buildroot}%{ldapserverdir}/%{_lib}
echo "minPoints %{check_password_minPoints}" >
%{buildroot}%{check_password_conf}
echo "useCracklib %{check_password_useCracklib}" >>
%{buildroot}%{check_password_conf}
echo "minUpper %{check_password_minUpper}" >>
%{buildroot}%{check_password_conf}
@@ -227,7 +227,7 @@
#=================================================
# Change owner
-/bin/chown -R %{ldapuser}:%{ldapgroup} %{ldapserverdir}/lib
+/bin/chown -R %{ldapuser}:%{ldapgroup} %{ldapserverdir}/%{_lib}
%preun -n openldap-ltb
#=================================================
@@ -281,12 +281,12 @@
%config(noreplace) /etc/logrotate.d/openldap
%{ldapbackupdir}
%exclude %{check_password_conf}
-%exclude %{ldapserverdir}/lib/check_password.so
+%exclude %{ldapserverdir}/%{_lib}/check_password.so
%files check-password
%config(noreplace) %{check_password_conf}
-%{ldapserverdir}/lib/check_password.so
+%{ldapserverdir}/%{_lib}/check_password.so
#=================================================
# Changelog
_______________________________________________
ltb-changes mailing list
[email protected]
http://lists.ltb-project.org/listinfo/ltb-changes
