bh: server/imapd kolab.patch,1.27,1.28 Makefile,1.25,1.26

[cvs at intevation.de]

Author: bh

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv17495/imapd

Modified Files:
	kolab.patch Makefile 
Log Message:
Update to OpenPKG 2.5


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- kolab.patch	17 Sep 2005 12:21:58 -0000	1.27
+++ kolab.patch	9 Dec 2005 15:55:22 -0000	1.28
@@ -1,5 +1,5 @@
---- ../imapd.orig/imapd.spec	2005-06-15 20:55:40.000000000 +0200
-+++ imapd.spec	2005-09-17 14:00:18.000000000 +0200
+--- imapd.spec.orig	Wed Dec  7 13:05:58 2005
++++ imapd.spec	Wed Dec  7 15:06:46 2005
 @@ -2,6 +2,9 @@
  ##  imapd.spec -- OpenPKG RPM Package Specification
  ##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
@@ -14,8 +14,8 @@
  Group:        Mail
  License:      BSD
  Version:      2.2.12
--Release:      2.4.0
-+Release:      2.4.0_kolab3
+-Release:      2.5.0
++Release:      2.5.0_kolab
  
  #   package options
 -%option       with_fsl    yes
@@ -57,7 +57,7 @@
  AutoReq:      no
  AutoReqProv:  no
  
-@@ -87,6 +104,7 @@ AutoReqProv:  no
+@@ -91,6 +108,7 @@ AutoReqProv:  no
      %{l_shtool} subst \
          -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
          lib/auth_unix.c
@@ -65,7 +65,7 @@
  %endif
  %if "%{with_drac}" == "yes"
      %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -94,10 +112,24 @@ AutoReqProv:  no
+@@ -98,10 +116,24 @@ AutoReqProv:  no
      sleep 1
      touch configure
  %endif
@@ -91,15 +91,15 @@
          configure
  
      #   ensure local et/com_err can be found
-@@ -158,6 +190,11 @@ AutoReqProv:  no
-         -e '/config_init/s;"deliver";"cyrdeliver";' \
+@@ -161,6 +193,11 @@ AutoReqProv:  no
+     %{l_shtool} subst \
+         -e '/alt_config/s;"deliver";"cyrdeliver";' \
          imap/deliver.c
- 
++
 +    %{l_shtool} subst \
 +	-e '/snprintf(buf, sizeof(buf), "%s/s;/reconstruct";/cyrreconstruct";' \
 +	-e '/snprintf(buf, sizeof(buf), "%s/s;/quota";/cyrquota";' \
 +	imap/imapd.c
-+
+ 
  %build
      cflags="%{l_cppflags}"
- %if "%{with_atvdom}" == "yes"

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile	17 Sep 2005 12:21:58 -0000	1.25
+++ Makefile	9 Dec 2005 15:55:22 -0000	1.26
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -10,7 +10,7 @@
 
 PACKAGE=imapd
 VERSION=2.2.12
-RELEASE=2.4.0
+RELEASE=2.5.0
 
 RPM=/kolab/bin/openpkg rpm