changeset
Update version, adapt patch, correct build configuration, install
Tue, 28 Aug 2012 18:42:20 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:42:20 +0200
- changeset 587
- d0df67c21897
- parent 586
- e10b124b2f21
- child 588
- 300d43423c2e
Update version, adapt patch, correct build configuration, install
pkg-config file, swap thread model, modernize packaging, use parallel
make, and correct more typical german english linguistic mistakes.
1.1 --- a/openldap/openldap.patch Sat Feb 04 20:20:10 2012 +0200 1.2 +++ b/openldap/openldap.patch Tue Aug 28 18:42:20 2012 +0200 1.3 @@ -29,7 +29,7 @@ 1.4 Index: libraries/libldap_r/tpool.c 1.5 --- libraries/libldap_r/tpool.c.orig 2011-11-25 19:52:29.000000000 +0100 1.6 +++ libraries/libldap_r/tpool.c 2011-12-11 14:01:59.000000000 +0100 1.7 -@@ -1019,6 +1019,6 @@ 1.8 +@@ -968,6 +968,6 @@ 1.9 { 1.10 ldap_int_thread_userctx_t *ctx = vctx; 1.11 1.12 @@ -40,7 +40,7 @@ 1.13 Index: libraries/libmdb/mdb.c 1.14 --- libraries/libmdb/mdb.c.orig 2011-11-25 19:52:29.000000000 +0100 1.15 +++ libraries/libmdb/mdb.c 2011-12-11 14:01:59.000000000 +0100 1.16 -@@ -213,7 +213,11 @@ 1.17 +@@ -198,7 +198,11 @@ 1.18 * Otherwise compile with the less efficient -DMDB_DSYNC=O_SYNC. 1.19 */ 1.20 #ifndef MDB_DSYNC
2.1 --- a/openldap/openldap.pc Sat Feb 04 20:20:10 2012 +0200 2.2 +++ b/openldap/openldap.pc Tue Aug 28 18:42:20 2012 +0200 2.3 @@ -6,5 +6,5 @@ 2.4 Name: openldap 2.5 Description: OpenLDAP Libraries 2.6 Version: @version@ 2.7 -Libs: -L${libdir} @libs@ 2.8 +Libs: @libdir@ @libs@ 2.9 Cflags: -I${includedir}
3.1 --- a/openldap/openldap.spec Sat Feb 04 20:20:10 2012 +0200 3.2 +++ b/openldap/openldap.spec Tue Aug 28 18:42:20 2012 +0200 3.3 @@ -31,16 +31,16 @@ 3.4 Class: BASE 3.5 Group: LDAP 3.6 License: GPL 3.7 -Version: 2.4.29 3.8 -Release: 20120208 3.9 +Version: 2.4.32 3.10 +Release: 20120800 3.11 3.12 # package options 3.13 %option with_server yes 3.14 %option with_fsl yes 3.15 %option with_crypt yes 3.16 %option with_overlays yes 3.17 -%option with_pthreads yes 3.18 -%option with_pth no 3.19 +%option with_pth yes 3.20 +%option with_pthreads no 3.21 %option with_sasl no 3.22 %option with_perl no 3.23 %option with_odbc no 3.24 @@ -53,10 +53,8 @@ 3.25 Patch0: openldap.patch 3.26 3.27 # build information 3.28 -Prefix: %{l_prefix} 3.29 -BuildRoot: %{l_buildroot} 3.30 -BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc 3.31 -PreReq: OpenPKG, openpkg >= 20060823 3.32 +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc 3.33 +PreReq: OpenPKG, openpkg >= 20100101 3.34 BuildPreReq: openssl, db >= 4.5 3.35 PreReq: openssl, db >= 4.5 3.36 %if "%{with_server}" == "yes" && "%{with_fsl}" == "yes" 3.37 @@ -79,8 +77,6 @@ 3.38 BuildPreReq: ODBC 3.39 PreReq: ODBC 3.40 %endif 3.41 -AutoReq: no 3.42 -AutoReqProv: no 3.43 3.44 %description 3.45 OpenLDAP is an open source implementation of the Lightweight 3.46 @@ -138,7 +134,8 @@ 3.47 ARGS="$ARGS --enable-dnssrv" 3.48 ARGS="$ARGS --enable-null" 3.49 ARGS="$ARGS --enable-shell" 3.50 - ARGS="$ARGS --with-proxycache" 3.51 + ARGS="$ARGS --enable-proxycache" 3.52 + ARGS="$ARGS --disable-mdb" 3.53 %else 3.54 ARGS="$ARGS --disable-slapd" 3.55 ARGS="$ARGS --disable-modules" 3.56 @@ -205,7 +202,7 @@ 3.57 *-sunos* ) CFLAGS="$CFLAGS -D_AVL_H"; LIBS="$LIBS -lrt" ;; 3.58 esac 3.59 3.60 - # configuration: use hard links and make sure our Berkeley-DB is picked up first 3.61 + # configuration: use hard links and make sure our Berkeley DB is picked up first 3.62 %{l_shtool} subst \ 3.63 -e 's;ln -s;ln;g' \ 3.64 -e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \ 3.65 @@ -216,13 +213,10 @@ 3.66 ./configure --cache-file=./config.cache $ARGS 3.67 3.68 # build toolkit 3.69 - %{l_make} %{l_mflags} depend 3.70 - %{l_make} %{l_mflags} 3.71 + %{l_make} %{l_mflags -O} depend 3.72 + %{l_make} %{l_mflags -O} 3.73 3.74 %install 3.75 - # clean build cruft 3.76 - rm -rf $RPM_BUILD_ROOT 3.77 - 3.78 # install toolkit 3.79 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 3.80 3.81 @@ -240,7 +234,7 @@ 3.82 # post adjustment: enable and correct slapd.pid 3.83 %if "%{with_server}" == "yes" 3.84 %{l_shtool} subst \ 3.85 - -e 's;^[ #]*\(pidfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \ 3.86 + -e 's;^\(pidfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \ 3.87 -e 's;^\(argsfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.args;' \ 3.88 $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf 3.89 %endif 3.90 @@ -252,7 +246,7 @@ 3.91 $RPM_BUILD_ROOT%{l_prefix}/lib/*.la 3.92 %endif 3.93 3.94 - # install run-command script 3.95 + # install run command script 3.96 %if "%{with_server}" == "yes" 3.97 %{l_shtool} mkdir -f -p -m 755 \ 3.98 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d 3.99 @@ -273,16 +267,22 @@ 3.100 %{l_shtool} mkdir -f -p -m 755 \ 3.101 $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig 3.102 libs="-lldap -llber" 3.103 + libdir="-L\${libdir}" 3.104 %if "%{with_sasl}" == "yes" 3.105 libs="$libs -lsasl2" 3.106 %endif 3.107 +%if "%{with_pth}" == "yes" 3.108 + libs="$libs -lpth" 3.109 + libdir="$libdir -L\${libdir}/pth" 3.110 +%endif 3.111 %{l_shtool} install -c -m 644 %{l_value -s -a} \ 3.112 -e "s;@version@;%{version};" \ 3.113 -e "s;@libs@;$libs;" \ 3.114 + -e "s;@libdir@;$libdir;" \ 3.115 %{SOURCE openldap.pc} \ 3.116 $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/ 3.117 3.118 - # optionally remove server-components 3.119 + # optionally remove server components 3.120 %if "%{with_server}" != "yes" 3.121 rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema 3.122 rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf 3.123 @@ -306,7 +306,6 @@ 3.124 %files -f files 3.125 3.126 %clean 3.127 - rm -rf $RPM_BUILD_ROOT 3.128 3.129 %pre 3.130 %if "%{with_server}" == "yes"
