steffen: server/openldap Makefile,1.10,1.11 kolab.patch,1.5,1.6

cvs at intevation.de cvs at intevation.de
Sat Jul 23 00:36:16 CEST 2005


Author: steffen

Update of /kolabrepository/server/openldap
In directory doto:/tmp/cvs-serv30112/openldap

Modified Files:
	Makefile kolab.patch 
Log Message:
Upgrade to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	25 May 2005 13:14:35 -0000	1.10
+++ Makefile	22 Jul 2005 22:36:14 -0000	1.11
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.3/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=openldap
-VERSION=2.2.23
-RELEASE=2.3.0
+VERSION=2.2.27
+RELEASE=2.4.0
 
 
 RPM=/kolab/bin/openpkg rpm

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/openldap/kolab.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab.patch	2 Jun 2005 02:12:58 -0000	1.5
+++ kolab.patch	22 Jul 2005 22:36:14 -0000	1.6
@@ -1,19 +1,20 @@
+Only in .: kolab.patch
 diff -upr ../openldap.orig/openldap.spec ./openldap.spec
---- ../openldap.orig/openldap.spec	2005-02-21 18:02:29.000000000 +0100
-+++ ./openldap.spec	2005-06-02 03:59:04.000000000 +0200
-@@ -34,7 +34,7 @@ Class:        BASE
+--- ../openldap.orig/openldap.spec	2005-06-15 20:55:42.000000000 +0200
++++ ./openldap.spec	2005-07-19 01:51:30.000000000 +0200
+@@ -33,7 +33,7 @@ Class:        BASE
  Group:        Database
  License:      GPL
- Version:      2.2.23
--Release:      2.3.0
-+Release:      2.3.0_kolab2
+ Version:      2.2.27
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options
  %option       with_fsl   yes
-@@ -54,8 +54,8 @@ Prefix:       %{l_prefix}
+@@ -53,8 +53,8 @@ Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
- BuildPreReq:  OpenPKG, openpkg >= 2.3.0, make, gcc
- PreReq:       OpenPKG, openpkg >= 2.3.0
+ BuildPreReq:  OpenPKG, openpkg >= 2.4.0, make, gcc
+ PreReq:       OpenPKG, openpkg >= 2.4.0
 -BuildPreReq:  readline, openssl, db >= 4.2, pth
 -PreReq:       readline, openssl, db >= 4.2, pth
 +BuildPreReq:  readline, openssl, db >= 4.2
@@ -21,16 +22,18 @@
  %if "%{with_fsl}" == "yes"
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
-@@ -90,7 +90,7 @@ AutoReqProv:  no
+@@ -90,8 +90,8 @@ AutoReqProv:  no
      #   (2. make sure our Berkeley-DB is picked up first)
      %{l_shtool} subst \
          -e 's;ln -s;ln;g' \
 -        -e 's;-ldb42;-ldb;g' \
+-        -e 's;-ldb43;-ldb;g' \
++        -e 's;-ldb42;%{l_prefix}/lib/libdb.a;g' \
 +        -e 's;-ldb43;%{l_prefix}/lib/libdb.a;g' \
          -e 's;<db\.h>;"db.h";g' \
          configure
  %if "%{with_sasl}" == "yes"
-@@ -108,10 +108,10 @@ AutoReqProv:  no
+@@ -109,10 +109,10 @@ AutoReqProv:  no
          ;;
      esac
      CC="%{l_cc}" \
@@ -45,7 +48,7 @@
      ./configure \
          --cache-file=./config.cache \
          --prefix=%{l_prefix} \
-@@ -160,7 +160,7 @@ AutoReqProv:  no
+@@ -161,7 +161,7 @@ AutoReqProv:  no
  %endif
          --with-dyngroup \
          --with-proxycache \
@@ -55,8 +58,8 @@
  
      #   build toolkit
 diff -upr ../openldap.orig/rc.openldap ./rc.openldap
---- ../openldap.orig/rc.openldap	2005-02-21 17:59:42.000000000 +0100
-+++ ./rc.openldap	2005-06-02 03:01:25.000000000 +0200
+--- ../openldap.orig/rc.openldap	2004-12-07 20:57:36.000000000 +0100
++++ ./rc.openldap	2005-07-19 01:50:46.000000000 +0200
 @@ -27,6 +27,10 @@
          [ ".`grep '^replogfile' $openldap_slapd_cfgfile`" != . ] && return 0
          return 1





More information about the commits mailing list