diff -r 5974eb964eec -r 4f3b1ee715dd openldap/openldap.spec
--- a/openldap/openldap.spec	Wed Sep 21 14:13:05 2011 +0200
+++ b/openldap/openldap.spec	Wed Sep 21 14:27:31 2011 +0200
@@ -31,8 +31,8 @@
 Class:        BASE
 Group:        LDAP
 License:      GPL
-Version:      2.4.16
-Release:      20090420
+Version:      2.4.26
+Release:      20110914
 
 #   package options
 %option       with_server   yes
@@ -116,9 +116,10 @@
     export LIBS=""
     export ARGS=""
     ARGS="$ARGS --prefix=%{l_prefix}"
+    ARGS="$ARGS --mandir=%{l_prefix}/man"
+    ARGS="$ARGS --infodir=%{l_prefix}/info"
     ARGS="$ARGS --libexecdir=%{l_prefix}/libexec/openldap"
     ARGS="$ARGS --localstatedir=%{l_prefix}/var/openldap"
-    ARGS="$ARGS --mandir=%{l_prefix}/man"
     ARGS="$ARGS --enable-syslog"
     ARGS="$ARGS --with-tls"
     ARGS="$ARGS --without-fetch"
@@ -220,8 +221,10 @@
     %{l_make} %{l_mflags}
 
 %install
+    #   clean build cruft
+    rm -rf $RPM_BUILD_ROOT
+
     #   install toolkit
-    rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
 
     #   post adjustment: remove extra files
@@ -238,7 +241,8 @@
     #   post adjustment: enable and correct slapd.pid
 %if "%{with_server}" == "yes"
     %{l_shtool} subst \
-        -e 's;^[ #]*\(pidfile \).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
+        -e 's;^[ #]*\(pidfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
+        -e 's;^\(argsfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.args;' \
         $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
 %endif