OpenPKG Specs / changeset

     1.1 --- a/openldap/openldap.patch	Wed Sep 21 14:13:05 2011 +0200
     1.2 +++ b/openldap/openldap.patch	Wed Sep 21 14:27:31 2011 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  Index: include/ac/fdset.h
     1.5 ---- include/ac/fdset.h.orig	2008-02-12 00:26:40 +0100
     1.6 -+++ include/ac/fdset.h	2008-10-13 11:38:23 +0200
     1.7 +--- include/ac/fdset.h.orig	2011-01-05 00:49:56.000000000 +0100
     1.8 ++++ include/ac/fdset.h	2011-02-12 10:17:43.000000000 +0100
     1.9  @@ -22,6 +22,13 @@
    1.10   #ifndef _AC_FDSET_H
    1.11   #define _AC_FDSET_H
    1.12 @@ -16,9 +16,9 @@
    1.13   #  define OPENLDAP_FD_SETSIZE 4096
    1.14   #endif
    1.15  Index: include/ldap_int_thread.h
    1.16 ---- include/ldap_int_thread.h.orig	2008-02-12 00:26:40 +0100
    1.17 -+++ include/ldap_int_thread.h	2008-10-13 11:38:23 +0200
    1.18 -@@ -100,6 +100,7 @@
    1.19 +--- include/ldap_int_thread.h.orig	2011-01-06 19:43:20.000000000 +0100
    1.20 ++++ include/ldap_int_thread.h	2011-02-12 10:17:43.000000000 +0100
    1.21 +@@ -110,6 +110,7 @@
    1.22    *                                 *
    1.23    ***********************************/
    1.24   
    1.25 @@ -27,9 +27,9 @@
    1.26   #include <pth.h>
    1.27   
    1.28  Index: libraries/libldap_r/tpool.c
    1.29 ---- libraries/libldap_r/tpool.c.orig	2008-03-21 01:46:03 +0100
    1.30 -+++ libraries/libldap_r/tpool.c	2008-10-13 11:38:23 +0200
    1.31 -@@ -950,6 +950,6 @@
    1.32 +--- libraries/libldap_r/tpool.c.orig	2011-01-05 00:50:08.000000000 +0100
    1.33 ++++ libraries/libldap_r/tpool.c	2011-02-12 10:17:43.000000000 +0100
    1.34 +@@ -968,6 +968,6 @@
    1.35   {
    1.36   	ldap_int_thread_userctx_t *ctx = vctx;
    1.37   
    1.38 @@ -38,8 +38,8 @@
    1.39   }
    1.40   #endif /* LDAP_THREAD_HAVE_TPOOL */
    1.41  Index: servers/slapd/back-perl/config.c
    1.42 ---- servers/slapd/back-perl/config.c.orig	2008-02-12 00:26:47 +0100
    1.43 -+++ servers/slapd/back-perl/config.c	2008-10-13 11:38:23 +0200
    1.44 +--- servers/slapd/back-perl/config.c.orig	2011-01-05 00:50:41.000000000 +0100
    1.45 ++++ servers/slapd/back-perl/config.c	2011-02-12 10:17:43.000000000 +0100
    1.46  @@ -49,6 +49,9 @@
    1.47   		}
    1.48   

     2.1 --- a/openldap/openldap.spec	Wed Sep 21 14:13:05 2011 +0200
     2.2 +++ b/openldap/openldap.spec	Wed Sep 21 14:27:31 2011 +0200
     2.3 @@ -31,8 +31,8 @@
     2.4  Class:        BASE
     2.5  Group:        LDAP
     2.6  License:      GPL
     2.7 -Version:      2.4.16
     2.8 -Release:      20090420
     2.9 +Version:      2.4.26
    2.10 +Release:      20110914
    2.11  
    2.12  #   package options
    2.13  %option       with_server   yes
    2.14 @@ -116,9 +116,10 @@
    2.15      export LIBS=""
    2.16      export ARGS=""
    2.17      ARGS="$ARGS --prefix=%{l_prefix}"
    2.18 +    ARGS="$ARGS --mandir=%{l_prefix}/man"
    2.19 +    ARGS="$ARGS --infodir=%{l_prefix}/info"
    2.20      ARGS="$ARGS --libexecdir=%{l_prefix}/libexec/openldap"
    2.21      ARGS="$ARGS --localstatedir=%{l_prefix}/var/openldap"
    2.22 -    ARGS="$ARGS --mandir=%{l_prefix}/man"
    2.23      ARGS="$ARGS --enable-syslog"
    2.24      ARGS="$ARGS --with-tls"
    2.25      ARGS="$ARGS --without-fetch"
    2.26 @@ -220,8 +221,10 @@
    2.27      %{l_make} %{l_mflags}
    2.28  
    2.29  %install
    2.30 +    #   clean build cruft
    2.31 +    rm -rf $RPM_BUILD_ROOT
    2.32 +
    2.33      #   install toolkit
    2.34 -    rm -rf $RPM_BUILD_ROOT
    2.35      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    2.36  
    2.37      #   post adjustment: remove extra files
    2.38 @@ -238,7 +241,8 @@
    2.39      #   post adjustment: enable and correct slapd.pid
    2.40  %if "%{with_server}" == "yes"
    2.41      %{l_shtool} subst \
    2.42 -        -e 's;^[ #]*\(pidfile \).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
    2.43 +        -e 's;^[ #]*\(pidfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
    2.44 +        -e 's;^\(argsfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.args;' \
    2.45          $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
    2.46  %endif
    2.47