auto-import openldap-2.0.25-1 from openldap-2.0.25-1.src.rpm

.cvsignore

@@ -1,3 +1,3 @@
-MigrationTools-40.tar.gz
+MigrationTools-44.tar.gz
 db-4.0.14.tar.gz
-openldap-2.0.23.tgz
+openldap-2.0.25.tgz

openldap.spec

@@ -1,10 +1,10 @@
-%define migtools_ver 40
+%define migtools_ver 44
 %define db_version 4.0.14
 %define backend gdbm
 Summary: The configuration files, libraries, and documentation for OpenLDAP.
 Name: openldap
-Version: 2.0.23
+Version: 2.0.25
-Release: 4
+Release: 1
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -31,7 +31,7 @@ Patch21: MigrationTools-38-instdir.patch
 Patch22: MigrationTools-36-mktemp.patch
 Patch23: MigrationTools-27-simple.patch
 Patch24: MigrationTools-26-suffix.patch
-Patch25: MigrationTools-24-schema.patch
+Patch25: MigrationTools-44-schema.patch
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPreReq: cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel
@@ -106,7 +106,7 @@ pushd MigrationTools-%{migtools_ver}
 %patch22 -p1 -b .mktemp
 %patch23 -p1 -b .simple
 %patch24 -p1 -b .suffix
-%patch25 -p2 -b .schema
+%patch25 -p1 -b .schema
 popd
 
 mkdir build-gdbm
@@ -118,6 +118,8 @@ ln -s ../configure build-krb5
 mkdir build-clients
 ln -s ../configure build-clients
 
+cp %{_datadir}/libtool/config.{sub,guess} build/
+
 %build
 dbdir=`pwd`/db-instroot
 %ifarch ia64
@@ -126,8 +128,8 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0"
 CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC"; export CFLAGS
 TARGET_PLATFORM=%{_target_platform}
 %define _target_platform --target=${TARGET_PLATFORM}
-libtoolize --force
 build() {
+cat << _EOF | sed -e 's,--host=[^ ]*,,g' -e 's,--build=[^ ]*,,g' -e 's,--target=[^ ]*,,g' -e 's,%{_target_platform},,g' > run-build
 %configure \
 	--with-slapd --with-slurpd --without-ldapd \
 	--with-threads=posix --enable-static \
@@ -144,18 +146,21 @@ build() {
 	--enable-cleartext \
 	--enable-crypt \
 	--enable-spasswd \
+	--enable-modules \
 	\
 	--libexecdir=%{_sbindir} \
 	--localstatedir=/%{_var}/run \
-	$@
+	$@ \$@
-make depend
+_EOF
-make
+sh -x ./run-build %{_target_platform}
+make depend %{_smp_mflags}
+make %{_smp_mflags} LIBTOOL=libtool
 }
 # Build Berkeley DB and install it into a temporary area, isolating OpenLDAP
 # from any future changes to the system-wide Berkeley DB library.
 pushd db-%{db_version}/dist
 ./configure --with-pic --disable-shared --with-uniquename=_openldap_rhl --prefix=${dbdir}
-make
+make %{_smp_mflags}
 make install
 popd
 # Build one for tools which use gdbm.
@@ -177,7 +182,8 @@ build --enable-ldbm --with-ldbm-api=%{backend} --enable-bdb --disable-shared --w
 unset CPPFLAGS
 unset LDFLAGS
 popd
-# Build clients without Kerberos password-checking support.
+# Build clients without Kerberos password-checking support which is only
+# useful in the server anyway.
 pushd build-clients
 build --disable-ldbm --enable-shared --without-kerberos
 popd
@@ -187,9 +193,10 @@ popd
 mkdir $RPM_BUILD_ROOT
 makeinstall() {
 # libtool loves relinking shared libraries
-rm -f libraries/*/*.la
+# rm -f libraries/*/*.la
-make
+make LIBTOOL=libtool
 %makeinstall \
+	LIBTOOL=libtool \
 	datadir=$RPM_BUILD_ROOT%{_datadir}/openldap \
 	libexecdir=$RPM_BUILD_ROOT%{_sbindir} \
 	localstatedir=/%{_var}/run \
@@ -243,13 +250,13 @@ fi
 mkdir -p $RPM_BUILD_ROOT/var/lib/ldap
 
 # Hack the build root out of the default config files.
-perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/etc/openldap/slapd.conf
+perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/slapd.conf
 
 # Get the buildroot out of the man pages.
 perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/*/*.*
 
 # We don't need the default files -- RPM handles changes.
-rm -f $RPM_BUILD_ROOT/etc/openldap/*.default
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/*.default
 
 # Install an init script for the server.
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -265,9 +272,12 @@ install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat
 install -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat/
 
 # Tweak permissions on the libraries to make sure they're correct.
-chmod +rx $RPM_BUILD_ROOT/%{_libdir}/lib*.so*
+chmod 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so*
-chmod +r $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
+chmod 644 $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
+
+# Remove files we don't want packaged.
+rm -f $RPM_BUILD_ROOT/%{_datadir}/openldap/migration/*.{instdir,simple,schema,mktemp,suffix}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -367,6 +377,16 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Mon Aug 26 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.25-1
+- update to 2.0.25 "stable", ldbm-over-gdbm (putting off migration of LDBM
+  slapd databases until we move to 2.1.x)
+- use %%{_smp_mflags} when running make
+- update to MigrationTools 44
+- enable dynamic module support in slapd
+
+* Thu May 16 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.23-5
+- rebuild in new environment
+
 * Wed Feb 20 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.23-3
 - use the gdbm backend again
 

sources

@@ -1,3 +1,3 @@
-f4eb7c0eae1552d8dad166a572f1302b  MigrationTools-40.tar.gz
+2cc51cbf0276c161724626c70b59f0b1  MigrationTools-44.tar.gz
 12262c64fcd64b772e7cffad8e4d0ebc  db-4.0.14.tar.gz
-d13cfded502c7d2b43b3c42b4e6dd599  openldap-2.0.23.tgz
+57ed9ea3d872595076d6eab7b93337bd  openldap-2.0.25.tgz