OpenPKG Specs: comparison openldap/openldap.spec

-:542fc8c24656
+:574164c374bb
 Packager:     OpenPKG Foundation e.V.
 Distribution: OpenPKG Community
 Class:        BASE
 Group:        LDAP
 License:      GPL
-Version:      2.4.29
+Version:      2.4.32
-Release:      20120208
+Release:      20120800
 #   package options
 %option       with_server   yes
 %option       with_fsl      yes
 %option       with_crypt    yes
 %option       with_overlays yes
-%option       with_pthreads yes
+%option       with_pth      yes
-%option       with_pth      no
+%option       with_pthreads no
 %option       with_sasl     no
 %option       with_perl     no
 %option       with_odbc     no
 #   list of sources
 Source2:      fsl.openldap
 Source3:      openldap.pc
 Patch0:       openldap.patch
 #   build information
-Prefix:       %{l_prefix}
+BuildPreReq:  OpenPKG, openpkg >= 20100101, make, gcc
-BuildRoot:    %{l_buildroot}
+PreReq:       OpenPKG, openpkg >= 20100101
-BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc
-PreReq:       OpenPKG, openpkg >= 20060823
 BuildPreReq:  openssl, db >= 4.5
 PreReq:       openssl, db >= 4.5
 %if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
 BuildPreReq:  fsl
 PreReq:       fsl
 %endif
 %if "%{with_server}" == "yes" && "%{with_odbc}" == "yes"
 BuildPreReq:  ODBC
 PreReq:       ODBC
 %endif
-AutoReq:      no
-AutoReqProv:  no
 %description
 OpenLDAP is an open source implementation of the Lightweight
 Directory Access Protocol (LDAP). The suite includes libraries
 implementing the LDAP protocol plus a stand alone LDAP server
 ARGS="$ARGS --enable-meta"
 ARGS="$ARGS --enable-monitor"
 ARGS="$ARGS --enable-dnssrv"
 ARGS="$ARGS --enable-null"
 ARGS="$ARGS --enable-shell"
-ARGS="$ARGS --with-proxycache"
+ARGS="$ARGS --enable-proxycache"
+ARGS="$ARGS --disable-mdb"
 %else
 ARGS="$ARGS --disable-slapd"
 ARGS="$ARGS --disable-modules"
 %endif
 #   configuration: special platform support
 case "%{l_platform -t}" in
 *-sunos* ) CFLAGS="$CFLAGS -D_AVL_H"; LIBS="$LIBS -lrt" ;;
 esac
-#   configuration: use hard links and make sure our Berkeley-DB is picked up first
+#   configuration: use hard links and make sure our Berkeley DB is picked up first
 %{l_shtool} subst \
 -e 's;ln -s;ln;g' \
 -e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
 -e 's;<db\.h>;"db.h";g' \
 configure
 #   configuration
 ./configure --cache-file=./config.cache $ARGS
 #   build toolkit
-%{l_make} %{l_mflags} depend
+%{l_make} %{l_mflags -O} depend
-%{l_make} %{l_mflags}
+%{l_make} %{l_mflags -O}
 %install
-#   clean build cruft
-rm -rf $RPM_BUILD_ROOT
 #   install toolkit
 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
 #   post adjustment: remove extra files
 rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*.default
 %endif
 #   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
 #   post adjustment: remove OSSP fsl dependency from libtool files
 %{l_shtool} subst \
 -e 's;-lfsl *;;' \
 $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
 %endif
-#   install run-command script
+#   install run command script
 %if "%{with_server}" == "yes"
 %{l_shtool} mkdir -f -p -m 755 \
 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
 %{l_shtool} install -c -m 755 %{l_value -s -a} \
 %{SOURCE rc.openldap} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 #   install pkg-config configuration
 %{l_shtool} mkdir -f -p -m 755 \
 $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
 libs="-lldap -llber"
+libdir="-L\${libdir}"
 %if "%{with_sasl}" == "yes"
 libs="$libs -lsasl2"
+%endif
+%if "%{with_pth}" == "yes"
+libs="$libs -lpth"
+libdir="$libdir -L\${libdir}/pth"
 %endif
 %{l_shtool} install -c -m 644 %{l_value -s -a} \
 -e "s;@version@;%{version};" \
 -e "s;@libs@;$libs;" \
+-e "s;@libdir@;$libdir;" \
 %{SOURCE openldap.pc} \
 $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
-#   optionally remove server-components
+#   optionally remove server components
 %if "%{with_server}" != "yes"
 rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema
 rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
 rm -rf $RPM_BUILD_ROOT%{l_prefix}/sbin
 rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/openldap
 '%config %{l_prefix}/etc/openldap/*.conf'
 %files -f files
 %clean
-rm -rf $RPM_BUILD_ROOT
 %pre
 %if "%{with_server}" == "yes"
 #   before upgrade, save status and stop service
 [ $1 -eq 2 ] || exit 0

OpenPKG Specs / file comparison

comparison: openldap/openldap.spec

openldap/openldap.spec