1.1 --- a/openldap/openldap.spec Wed Sep 21 14:13:05 2011 +0200
1.2 +++ b/openldap/openldap.spec Wed Sep 21 14:27:31 2011 +0200
1.3 @@ -31,8 +31,8 @@
1.4 Class: BASE
1.5 Group: LDAP
1.6 License: GPL
1.7 -Version: 2.4.16
1.8 -Release: 20090420
1.9 +Version: 2.4.26
1.10 +Release: 20110914
1.11
1.12 # package options
1.13 %option with_server yes
1.14 @@ -116,9 +116,10 @@
1.15 export LIBS=""
1.16 export ARGS=""
1.17 ARGS="$ARGS --prefix=%{l_prefix}"
1.18 + ARGS="$ARGS --mandir=%{l_prefix}/man"
1.19 + ARGS="$ARGS --infodir=%{l_prefix}/info"
1.20 ARGS="$ARGS --libexecdir=%{l_prefix}/libexec/openldap"
1.21 ARGS="$ARGS --localstatedir=%{l_prefix}/var/openldap"
1.22 - ARGS="$ARGS --mandir=%{l_prefix}/man"
1.23 ARGS="$ARGS --enable-syslog"
1.24 ARGS="$ARGS --with-tls"
1.25 ARGS="$ARGS --without-fetch"
1.26 @@ -220,8 +221,10 @@
1.27 %{l_make} %{l_mflags}
1.28
1.29 %install
1.30 + # clean build cruft
1.31 + rm -rf $RPM_BUILD_ROOT
1.32 +
1.33 # install toolkit
1.34 - rm -rf $RPM_BUILD_ROOT
1.35 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
1.36
1.37 # post adjustment: remove extra files
1.38 @@ -238,7 +241,8 @@
1.39 # post adjustment: enable and correct slapd.pid
1.40 %if "%{with_server}" == "yes"
1.41 %{l_shtool} subst \
1.42 - -e 's;^[ #]*\(pidfile \).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
1.43 + -e 's;^[ #]*\(pidfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
1.44 + -e 's;^\(argsfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.args;' \
1.45 $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
1.46 %endif
1.47
