1.1 --- a/openldap/openldap.spec Sat Feb 04 20:20:10 2012 +0200
1.2 +++ b/openldap/openldap.spec Tue Aug 28 18:42:20 2012 +0200
1.3 @@ -31,16 +31,16 @@
1.4 Class: BASE
1.5 Group: LDAP
1.6 License: GPL
1.7 -Version: 2.4.29
1.8 -Release: 20120208
1.9 +Version: 2.4.32
1.10 +Release: 20120800
1.11
1.12 # package options
1.13 %option with_server yes
1.14 %option with_fsl yes
1.15 %option with_crypt yes
1.16 %option with_overlays yes
1.17 -%option with_pthreads yes
1.18 -%option with_pth no
1.19 +%option with_pth yes
1.20 +%option with_pthreads no
1.21 %option with_sasl no
1.22 %option with_perl no
1.23 %option with_odbc no
1.24 @@ -53,10 +53,8 @@
1.25 Patch0: openldap.patch
1.26
1.27 # build information
1.28 -Prefix: %{l_prefix}
1.29 -BuildRoot: %{l_buildroot}
1.30 -BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
1.31 -PreReq: OpenPKG, openpkg >= 20060823
1.32 +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc
1.33 +PreReq: OpenPKG, openpkg >= 20100101
1.34 BuildPreReq: openssl, db >= 4.5
1.35 PreReq: openssl, db >= 4.5
1.36 %if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
1.37 @@ -79,8 +77,6 @@
1.38 BuildPreReq: ODBC
1.39 PreReq: ODBC
1.40 %endif
1.41 -AutoReq: no
1.42 -AutoReqProv: no
1.43
1.44 %description
1.45 OpenLDAP is an open source implementation of the Lightweight
1.46 @@ -138,7 +134,8 @@
1.47 ARGS="$ARGS --enable-dnssrv"
1.48 ARGS="$ARGS --enable-null"
1.49 ARGS="$ARGS --enable-shell"
1.50 - ARGS="$ARGS --with-proxycache"
1.51 + ARGS="$ARGS --enable-proxycache"
1.52 + ARGS="$ARGS --disable-mdb"
1.53 %else
1.54 ARGS="$ARGS --disable-slapd"
1.55 ARGS="$ARGS --disable-modules"
1.56 @@ -205,7 +202,7 @@
1.57 *-sunos* ) CFLAGS="$CFLAGS -D_AVL_H"; LIBS="$LIBS -lrt" ;;
1.58 esac
1.59
1.60 - # configuration: use hard links and make sure our Berkeley-DB is picked up first
1.61 + # configuration: use hard links and make sure our Berkeley DB is picked up first
1.62 %{l_shtool} subst \
1.63 -e 's;ln -s;ln;g' \
1.64 -e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
1.65 @@ -216,13 +213,10 @@
1.66 ./configure --cache-file=./config.cache $ARGS
1.67
1.68 # build toolkit
1.69 - %{l_make} %{l_mflags} depend
1.70 - %{l_make} %{l_mflags}
1.71 + %{l_make} %{l_mflags -O} depend
1.72 + %{l_make} %{l_mflags -O}
1.73
1.74 %install
1.75 - # clean build cruft
1.76 - rm -rf $RPM_BUILD_ROOT
1.77 -
1.78 # install toolkit
1.79 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
1.80
1.81 @@ -240,7 +234,7 @@
1.82 # post adjustment: enable and correct slapd.pid
1.83 %if "%{with_server}" == "yes"
1.84 %{l_shtool} subst \
1.85 - -e 's;^[ #]*\(pidfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
1.86 + -e 's;^\(pidfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
1.87 -e 's;^\(argsfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.args;' \
1.88 $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
1.89 %endif
1.90 @@ -252,7 +246,7 @@
1.91 $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
1.92 %endif
1.93
1.94 - # install run-command script
1.95 + # install run command script
1.96 %if "%{with_server}" == "yes"
1.97 %{l_shtool} mkdir -f -p -m 755 \
1.98 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
1.99 @@ -273,16 +267,22 @@
1.100 %{l_shtool} mkdir -f -p -m 755 \
1.101 $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
1.102 libs="-lldap -llber"
1.103 + libdir="-L\${libdir}"
1.104 %if "%{with_sasl}" == "yes"
1.105 libs="$libs -lsasl2"
1.106 %endif
1.107 +%if "%{with_pth}" == "yes"
1.108 + libs="$libs -lpth"
1.109 + libdir="$libdir -L\${libdir}/pth"
1.110 +%endif
1.111 %{l_shtool} install -c -m 644 %{l_value -s -a} \
1.112 -e "s;@version@;%{version};" \
1.113 -e "s;@libs@;$libs;" \
1.114 + -e "s;@libdir@;$libdir;" \
1.115 %{SOURCE openldap.pc} \
1.116 $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
1.117
1.118 - # optionally remove server-components
1.119 + # optionally remove server components
1.120 %if "%{with_server}" != "yes"
1.121 rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema
1.122 rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
1.123 @@ -306,7 +306,6 @@
1.124 %files -f files
1.125
1.126 %clean
1.127 - rm -rf $RPM_BUILD_ROOT
1.128
1.129 %pre
1.130 %if "%{with_server}" == "yes"
