[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-11-25 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   25-Nov-2003 15:55:17
  Branch: HEAD Handle: 2003112514551601

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
step back and solve the real libtool problem: enable module is not
needed at all because all modules are static

  Summary:
RevisionChanges Path
1.92+4  -8  openpkg-src/openldap/openldap.spec
1.7532  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.91 -r1.92 openldap.spec
  --- openpkg-src/openldap/openldap.spec23 Nov 2003 20:50:30 -  1.91
  +++ openpkg-src/openldap/openldap.spec25 Nov 2003 14:55:17 -  1.92
  @@ -33,7 +33,7 @@
   Group:Database
   License:  GPL
   Version:  2.1.23
  -Release:  20031123
  +Release:  20031125
   
   #   package options
   %option   with_fsl  yes
  @@ -49,7 +49,7 @@
   #   build information
   Prefix:   %{l_prefix}
   BuildRoot:%{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030718, make, gcc, libtool
  +BuildPreReq:  OpenPKG, openpkg >= 20030718, make, gcc
   PreReq:   OpenPKG, openpkg >= 20030718
   BuildPreReq:  readline, openssl, db >= 4.1.24
   PreReq:   readline, openssl, db >= 4.1.24
  @@ -92,15 +92,11 @@
   %else
   cf="%{l_cppflags}"
   %endif
  -LIBS=""
  -if [ -f /usr/lib/libdl.so -o -f /usr/lib/libdl.a ]; then
  -LIBS="$LIBS -ldl"
  -fi
   CC="%{l_cc}" \
   CFLAGS="%{l_cflags -O}" \
   CPPFLAGS="$cf" \
   LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
  -LIBS="$LIBS %{l_fsl_libs}" \
  +LIBS="%{l_fsl_libs}" \
   ./configure \
   --cache-file=./config.cache \
   --prefix=%{l_prefix} \
  @@ -118,7 +114,7 @@
   %endif
   --disable-dynamic \
   --disable-shared \
  ---enable-modules \
  +--disable-modules \
   --enable-rewrite \
   --enable-ldbm \
   --with-ldbm-module=static \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.7531 -r1.7532 news.txt
  --- openpkg-web/news.txt  25 Nov 2003 14:31:49 -  1.7531
  +++ openpkg-web/news.txt  25 Nov 2003 14:55:16 -  1.7532
  @@ -1,3 +1,4 @@
  +25-Nov-2003: Upgraded package: P
   25-Nov-2003: Upgraded package: P
   25-Nov-2003: Upgraded package: P
   25-Nov-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-11-23 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   23-Nov-2003 21:50:30
  Branch: HEAD Handle: 2003112320502802

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
fix configure failing libtool check on Linux

  Summary:
RevisionChanges Path
1.91+6  -2  openpkg-src/openldap/openldap.spec
1.7513  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.90 -r1.91 openldap.spec
  --- openpkg-src/openldap/openldap.spec21 Nov 2003 23:50:38 -  1.90
  +++ openpkg-src/openldap/openldap.spec23 Nov 2003 20:50:30 -  1.91
  @@ -33,7 +33,7 @@
   Group:Database
   License:  GPL
   Version:  2.1.23
  -Release:  20031122
  +Release:  20031123
   
   #   package options
   %option   with_fsl  yes
  @@ -92,11 +92,15 @@
   %else
   cf="%{l_cppflags}"
   %endif
  +LIBS=""
  +if [ -f /usr/lib/libdl.so -o -f /usr/lib/libdl.a ]; then
  +LIBS="$LIBS -ldl"
  +fi
   CC="%{l_cc}" \
   CFLAGS="%{l_cflags -O}" \
   CPPFLAGS="$cf" \
   LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
  -LIBS="%{l_fsl_libs}" \
  +LIBS="$LIBS %{l_fsl_libs}" \
   ./configure \
   --cache-file=./config.cache \
   --prefix=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.7512 -r1.7513 news.txt
  --- openpkg-web/news.txt  23 Nov 2003 19:34:57 -  1.7512
  +++ openpkg-web/news.txt  23 Nov 2003 20:50:28 -  1.7513
  @@ -1,3 +1,4 @@
  +23-Nov-2003: Upgraded package: P
   23-Nov-2003: Upgraded package: P
   23-Nov-2003: Upgraded package: P
   23-Nov-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-07-25 Thread Michael van Elst 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael van Elst
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   25-Jul-2003 15:59:42
  Branch: HEAD Handle: 2003072514594001

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
remove fsl dependency from libtool files

  Summary:
RevisionChanges Path
1.86+6  -1  openpkg-src/openldap/openldap.spec
1.5809  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.85 -r1.86 openldap.spec
  --- openpkg-src/openldap/openldap.spec24 Jul 2003 07:03:14 -  1.85
  +++ openpkg-src/openldap/openldap.spec25 Jul 2003 13:59:41 -  1.86
  @@ -33,7 +33,7 @@
   Group:Database
   License:  GPL
   Version:  2.1.22
  -Release:  20030724
  +Release:  20030725
   
   #   package options
   %option   with_fsl  yes
  @@ -122,6 +122,11 @@
   %{l_shtool} subst \
   -e '/\$OpenLDAP: .*slapd\.conf,v/d' \
   $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
  +
  +#   remove fsl dependency from libtool files
  +%{l_shtool} subst \
  +-e 's;-lfsl *;;' \
  +$RPM_BUILD_ROOT%{l_prefix}/lib/*.la
   
   #   install run-command script
   %{l_shtool} mkdir -f -p -m 755 \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.5808 -r1.5809 news.txt
  --- openpkg-web/news.txt  25 Jul 2003 13:40:33 -  1.5808
  +++ openpkg-web/news.txt  25 Jul 2003 13:59:40 -  1.5809
  @@ -1,3 +1,4 @@
  +25-Jul-2003: Upgraded package: P
   25-Jul-2003: Upgraded package: P
   25-Jul-2003: Upgraded package: P
   25-Jul-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-07-07 Thread Michael van Elst 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael van Elst
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   07-Jul-2003 14:42:20
  Branch: HEAD Handle: 2003070713421901

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
add libraries to PreReq

  Summary:
RevisionChanges Path
1.73+4  -2  openpkg-src/openldap/openldap.spec
1.5386  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.72 -r1.73 openldap.spec
  --- openpkg-src/openldap/openldap.spec4 Jul 2003 18:39:34 -   1.72
  +++ openpkg-src/openldap/openldap.spec7 Jul 2003 12:42:20 -   1.73
  @@ -33,7 +33,7 @@
   Group:Database
   License:  GPL
   Version:  2.1.22
  -Release:  20030704
  +Release:  20030707
   
   #   package options
   %option   with_fsl  yes
  @@ -47,8 +47,10 @@
   #   build information
   Prefix:   %{l_prefix}
   BuildRoot:%{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030415, openssl, db >= 4.1.24, make, gcc
  +BuildPreReq:  OpenPKG, openpkg >= 20030415, make, gcc
   PreReq:   OpenPKG, openpkg >= 20030415
  +BuildPreReq:  openssl, db >= 4.1.24
  +PreReq:   openssl, db >= 4.1.24
   %if "%{with_fsl}" == "yes"
   BuildPreReq:  fsl
   PreReq:   fsl
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.5385 -r1.5386 news.txt
  --- openpkg-web/news.txt  7 Jul 2003 12:40:40 -   1.5385
  +++ openpkg-web/news.txt  7 Jul 2003 12:42:19 -   1.5386
  @@ -1,3 +1,4 @@
  +07-Jul-2003: Upgraded package: P
   07-Jul-2003: Upgraded package: P
   07-Jul-2003: Upgraded package: P
   07-Jul-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-07-04 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   04-Jul-2003 20:39:34
  Branch: HEAD Handle: 2003070419393301

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
rpmlint police: move into subdir of libexec

  Summary:
RevisionChanges Path
1.72+3  -2  openpkg-src/openldap/openldap.spec
1.5268  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.71 -r1.72 openldap.spec
  --- openpkg-src/openldap/openldap.spec1 Jul 2003 15:43:54 -   1.71
  +++ openpkg-src/openldap/openldap.spec4 Jul 2003 18:39:34 -   1.72
  @@ -33,7 +33,7 @@
   Group:Database
   License:  GPL
   Version:  2.1.22
  -Release:  20030701
  +Release:  20030704
   
   #   package options
   %option   with_fsl  yes
  @@ -91,6 +91,7 @@
   LIBS="%{l_fsl_libs}" \
   ./configure \
   --prefix=%{l_prefix} \
  +--libexecdir=%{l_prefix}/libexec/openldap \
   --localstatedir=%{l_prefix}/var/openldap \
   --enable-ldbm \
   --with-ldbm-api=berkeley \
  @@ -115,7 +116,7 @@
   rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*.default
   rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
   
  -#   Creating run-command script
  +#   creating run-command script
   %{l_shtool} mkdir -f -p -m 755 \
   $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
   %{l_shtool} install -c -m 755 \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.5267 -r1.5268 news.txt
  --- openpkg-web/news.txt  4 Jul 2003 18:36:15 -   1.5267
  +++ openpkg-web/news.txt  4 Jul 2003 18:39:33 -   1.5268
  @@ -1,3 +1,4 @@
  +04-Jul-2003: Upgraded package: P
   04-Jul-2003: Upgraded package: P
   04-Jul-2003: Upgraded package: P
   04-Jul-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-06-09 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   09-Jun-2003 17:57:17
  Branch: HEAD Handle: 2003060916571501

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
move up to BASE because required more and more by BASE packages like
proftpd

  Summary:
RevisionChanges Path
1.69+2  -2  openpkg-src/openldap/openldap.spec
1.4782  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.68 -r1.69 openldap.spec
  --- openpkg-src/openldap/openldap.spec31 May 2003 11:52:09 -  1.68
  +++ openpkg-src/openldap/openldap.spec9 Jun 2003 15:57:16 -   1.69
  @@ -29,11 +29,11 @@
   URL:  http://www.openldap.org/
   Vendor:   OpenLDAP Project
   Packager: The OpenPKG Project
  -Distribution: OpenPKG [PLUS]
  +Distribution: OpenPKG [BASE]
   Group:Database
   License:  GPL
   Version:  2.1.21
  -Release:  20030531
  +Release:  20030609
   
   #   package options
   %option   with_sasl no
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.4781 -r1.4782 news.txt
  --- openpkg-web/news.txt  9 Jun 2003 15:56:21 -   1.4781
  +++ openpkg-web/news.txt  9 Jun 2003 15:57:15 -   1.4782
  @@ -1,3 +1,4 @@
  +09-Jun-2003: Upgraded package: P
   09-Jun-2003: Upgraded package: P
   09-Jun-2003: Upgraded package: P
   09-Jun-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-05-31 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   31-May-2003 13:52:10
  Branch: HEAD Handle: 2003053112520702

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
try to pick up our Berkeley-DB first

  Summary:
RevisionChanges Path
1.68+5  -1  openpkg-src/openldap/openldap.spec
1.4671  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.67 -r1.68 openldap.spec
  --- openpkg-src/openldap/openldap.spec30 May 2003 08:13:56 -  1.67
  +++ openpkg-src/openldap/openldap.spec31 May 2003 11:52:09 -  1.68
  @@ -33,7 +33,7 @@
   Group:Database
   License:  GPL
   Version:  2.1.21
  -Release:  20030530
  +Release:  20030531
   
   #   package options
   %option   with_sasl no
  @@ -65,6 +65,10 @@
   %setup -q
   
   %build
  +#   make sure our Berkeley-DB is picked up first
  +%{l_shtool} subst \
  +-e 's;-ldb41;-ldb;g' \
  +configure
   %if "%{with_sasl}" == "yes"
   #   hard-code configure to use SASL2 library
   %{l_shtool} subst \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.4670 -r1.4671 news.txt
  --- openpkg-web/news.txt  31 May 2003 10:48:51 -  1.4670
  +++ openpkg-web/news.txt  31 May 2003 11:52:07 -  1.4671
  @@ -1,3 +1,4 @@
  +31-May-2003: Upgraded package: P
   31-May-2003: Upgraded package: P
   31-May-2003: Upgraded package: P
   31-May-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-03-24 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   24-Mar-2003 20:27:46
  Branch: HEAD Handle: 2003032419274401

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
speclint police

  Summary:
RevisionChanges Path
1.61+4  -4  openpkg-src/openldap/openldap.spec
1.3807  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.60 -r1.61 openldap.spec
  --- openpkg-src/openldap/openldap.spec21 Mar 2003 09:36:48 -  1.60
  +++ openpkg-src/openldap/openldap.spec24 Mar 2003 19:27:45 -  1.61
  @@ -33,14 +33,14 @@
   Group:Database
   License:  GPL
   Version:  2.1.16
  -Release:  20030321
  +Release:  20030324
  +
  +#   package options
  +%option   with_sasl no
   
   #   list of sources
   Source0:  
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
   Source1:  rc.openldap
  -
  -#   package options
  -%option   with_sasl no
   
   #   build information
   Prefix:   %{l_prefix}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.3806 -r1.3807 news.txt
  --- openpkg-web/news.txt  24 Mar 2003 19:26:07 -  1.3806
  +++ openpkg-web/news.txt  24 Mar 2003 19:27:44 -  1.3807
  @@ -1,3 +1,4 @@
  +24-Mar-2003: Upgraded package: P
   24-Mar-2003: Upgraded package: P
   24-Mar-2003: Upgraded package: P
   24-Mar-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-03-21 Thread Michael van Elst 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael van Elst
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   21-Mar-2003 10:36:48
  Branch: HEAD Handle: 2003032109364602

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
fix with_sasl build

  Summary:
RevisionChanges Path
1.60+2  -2  openpkg-src/openldap/openldap.spec
1.3752  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.59 -r1.60 openldap.spec
  --- openpkg-src/openldap/openldap.spec15 Mar 2003 07:50:36 -  1.59
  +++ openpkg-src/openldap/openldap.spec21 Mar 2003 09:36:48 -  1.60
  @@ -33,7 +33,7 @@
   Group:Database
   License:  GPL
   Version:  2.1.16
  -Release:  20030315
  +Release:  20030321
   
   #   list of sources
   Source0:  
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
  @@ -86,7 +86,7 @@
   --with-ldbm-module=static \
   --with-ldbm-type=btree \
   %if "%{with_sasl}" == "yes"
  ---with-cyrus-sasl=%{l_prefix} \
  +--with-cyrus-sasl \
   --enable-spasswd \
   %else
   --without-cyrus-sasl \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.3751 -r1.3752 news.txt
  --- openpkg-web/news.txt  21 Mar 2003 09:31:38 -  1.3751
  +++ openpkg-web/news.txt  21 Mar 2003 09:36:46 -  1.3752
  @@ -1,3 +1,4 @@
  +21-Mar-2003: Upgraded package: P
   21-Mar-2003: Upgraded package: P
   21-Mar-2003: Upgraded package: P
   20-Mar-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-03-12 Thread Michael van Elst 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael van Elst
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   12-Mar-2003 13:25:33
  Branch: HEAD Handle: 2003031212252902

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
use DESTDIR for installation, fixes slapd.conf

  Summary:
RevisionChanges Path
1.57+2  -7  openpkg-src/openldap/openldap.spec
1.3659  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.56 -r1.57 openldap.spec
  --- openpkg-src/openldap/openldap.spec10 Mar 2003 19:05:41 -  1.56
  +++ openpkg-src/openldap/openldap.spec12 Mar 2003 12:25:31 -  1.57
  @@ -33,7 +33,7 @@
   Group:Database
   License:  GPL
   Version:  2.1.15
  -Release:  20030310
  +Release:  20030312
   
   #   list of sources
   Source0:  
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
  @@ -98,12 +98,7 @@
   
   %install
   rm -rf $RPM_BUILD_ROOT
  -%{l_shtool} subst -v -s \
  --e "s;^\\(prefix[^=]*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix};g" \
  --e "s;^\\(exec_prefix[^=]*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix};g" \
  --e "s;^\\(localstatedir[^=]*=\\).*;\\1 
$RPM_BUILD_ROOT%{l_prefix}/var/openldap;g" \
  -`find . -name Makefile -print`
  -%{l_make} %{l_mflags} install
  +%{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
   rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*.default
   rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
   %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/openldap
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.3658 -r1.3659 news.txt
  --- openpkg-web/news.txt  12 Mar 2003 10:16:45 -  1.3658
  +++ openpkg-web/news.txt  12 Mar 2003 12:25:29 -  1.3659
  @@ -1,3 +1,4 @@
  +12-Mar-2003: Upgraded package: P
   12-Mar-2003: Upgraded package: P
   12-Mar-2003: Upgraded package: P
   12-Mar-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-03-07 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   07-Mar-2003 12:44:54
  Branch: HEAD Handle: 2003030711445102

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
try to fully disable SASL stuff

  Summary:
RevisionChanges Path
1.53+3  -6  openpkg-src/openldap/openldap.spec
1.3601  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.52 -r1.53 openldap.spec
  --- openpkg-src/openldap/openldap.spec5 Mar 2003 18:51:40 -   1.52
  +++ openpkg-src/openldap/openldap.spec7 Mar 2003 11:44:53 -   1.53
  @@ -33,7 +33,7 @@
   Group:Database
   License:  GPL
   Version:  2.1.14
  -Release:  20030305
  +Release:  20030307
   
   #   list of sources
   Source0:  
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
  @@ -58,11 +58,6 @@
   %setup -q
   
   %build
  -#   hard-code configure to use SASL2 library
  -%{l_shtool} subst \
  --e '4s/.*/ac_cv_lib_sasl2_sasl_client_init=yes/' \
  -configure
  -
   CC="%{l_cc}" \
   CFLAGS="%{l_cflags -O}" \
   CPPFLAGS="%{l_cppflags sasl}" \
  @@ -75,6 +70,8 @@
   --with-ldbm-module=static \
   --with-ldbm-type=btree \
   --enable-slurpd \
  +--without-cyrus-sasl \
  +--disable-spasswd \
   --disable-shared
   %{l_make} %{l_mflags}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.3600 -r1.3601 news.txt
  --- openpkg-web/news.txt  7 Mar 2003 11:35:27 -   1.3600
  +++ openpkg-web/news.txt  7 Mar 2003 11:44:51 -   1.3601
  @@ -1,3 +1,4 @@
  +07-Mar-2003: Upgraded package: P
   07-Mar-2003: Upgraded package: P
   07-Mar-2003: New package: P
   07-Mar-2003: New package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

Re: [CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-02-12 Thread Michael van Elst 
On Wed, Feb 12, 2003, Ralf S. Engelschall wrote:

> On Wed, Feb 12, 2003, Michael van Elst wrote:
> 
> > force usage of sasl2, configure test fails because of dependency to
> > berkeley db
> > [...]
> >%build
> >   +# hardware configure to use sasl2 library
> >   +%{l_shtool} subst \
> >   +-e '4s/.*/ac_cv_lib_sasl2_sasl_client_init=yes/' \
> >   +configure
> >   +
> 
> Any reason why not to use our standard approach which we already
> used dozens of times in packages:
> 
>  ...
>  echo "ac_cv_lib_sasl2_sasl_client_init=yes" >config.cache
>  ...
>  --cache-file=./config.cache

the configure script, while specifying a --cache-file option,
simply ignores such an option. It never reads a config.cache.


-- 
   Michael van Elst
   [EMAIL PROTECTED]
__
The OpenPKG Projectwww.openpkg.org
Developer Communication List   [EMAIL PROTECTED]

Re: [CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-02-12 Thread Ralf S. Engelschall 
On Wed, Feb 12, 2003, Michael van Elst wrote:

> force usage of sasl2, configure test fails because of dependency to
> berkeley db
> [...]
>%build
>   +# hardware configure to use sasl2 library
>   +%{l_shtool} subst \
>   +-e '4s/.*/ac_cv_lib_sasl2_sasl_client_init=yes/' \
>   +configure
>   +

Any reason why not to use our standard approach which we already
used dozens of times in packages:

 ...
 echo "ac_cv_lib_sasl2_sasl_client_init=yes" >config.cache
 ...
 --cache-file=./config.cache
 ...

   Ralf S. Engelschall
   [EMAIL PROTECTED]
   www.engelschall.com

__
The OpenPKG Projectwww.openpkg.org
Developer Communication List   [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec openpkg-web/ news.t...

2003-02-12 Thread Michael van Elst 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael van Elst
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   12-Feb-2003 17:04:05
  Branch: HEAD Handle: 2003021216040301

  Modified files:
openpkg-src/openldapopenldap.spec
openpkg-web news.txt

  Log:
force usage of sasl2, configure test fails because of dependency to
berkeley db

  Summary:
RevisionChanges Path
1.49+6  -1  openpkg-src/openldap/openldap.spec
1.3282  +1  -0  openpkg-web/news.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.48 -r1.49 openldap.spec
  --- openpkg-src/openldap/openldap.spec8 Jan 2003 19:24:53 -   1.48
  +++ openpkg-src/openldap/openldap.spec12 Feb 2003 16:04:04 -  1.49
  @@ -33,7 +33,7 @@
   Group:Database
   License:  GPL
   Version:  2.1.12
  -Release:  20030108
  +Release:  20030212
   
   #   list of sources
   Source0:  
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
  @@ -58,6 +58,11 @@
   %setup -q
   
   %build
  +# hardware configure to use sasl2 library
  +%{l_shtool} subst \
  +-e '4s/.*/ac_cv_lib_sasl2_sasl_client_init=yes/' \
  +configure
  +
   CC="%{l_cc}" \
   CFLAGS="%{l_cflags -O}" \
   CPPFLAGS="%{l_cppflags sasl}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.3281 -r1.3282 news.txt
  --- openpkg-web/news.txt  12 Feb 2003 16:00:22 -  1.3281
  +++ openpkg-web/news.txt  12 Feb 2003 16:04:03 -  1.3282
  @@ -1,3 +1,4 @@
  +12-Feb-2003: Upgraded package: P
   12-Feb-2003: New package: P
   12-Feb-2003: Upgraded package: P
   12-Feb-2003: Upgraded package: P
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]