steffen: server/imapd Makefile, 1.22, 1.22.2.1 kolab.patch, 1.22, 1.22.2.1

cvs at intevation.de cvs at intevation.de
Tue Jul 19 23:01:01 CEST 2005


Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
Updated to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- Makefile	20 Apr 2005 23:09:35 -0000	1.22
+++ Makefile	19 Jul 2005 21:00:59 -0000	1.22.2.1
@@ -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
@@ -10,7 +10,7 @@
 
 PACKAGE=imapd
 VERSION=2.2.12
-RELEASE=2.3.0
+RELEASE=2.4.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- kolab.patch	10 Jun 2005 02:03:42 -0000	1.22
+++ kolab.patch	19 Jul 2005 21:00:59 -0000	1.22.2.1
@@ -1,9 +1,9 @@
 --- ../imapd.orig/imapd.spec	2005-02-21 18:02:27.000000000 +0100
 +++ imapd.spec	2005-06-10 04:00:13.000000000 +0200
 @@ -3,6 +3,9 @@
- ##  Copyright (c) 2000-2005 The OpenPKG Project <http://www.openpkg.org/>
- ##  Copyright (c) 2000-2005 Ralf S. Engelschall <rse at engelschall.com>
- ##  Copyright (c) 2000-2005 Cable & Wireless <http://www.cw.com/>
+ ##  imapd.spec -- OpenPKG RPM Package Specification
+ ##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
+ ##  Copyright (c) 2000-2005 Ralf S. Engelschall <http://engelschall.com/>
 +##  Copyright (c) 2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 +##  Copyright (c) 2004 Martin Konold <martin.konold at erfrakon.de>
 +##  Copyright (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
@@ -14,8 +14,8 @@
  Group:        Mail
  License:      BSD
  Version:      2.2.12
--Release:      2.3.0
-+Release:      2.3.0_kolab4
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options
 -%option       with_fsl    yes
@@ -85,18 +85,3 @@
          configure
  
      #   ensure local com_err can be used
-@@ -112,12 +138,12 @@ AutoReqProv:  no
-         *-sunos* )
-             %{l_shtool} subst \
-                 -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb -lrt\2;' \
--                perl/imap/Makefile.PL
-+                perl/imap/Makefile.PL perl/sieve/managesieve/Makefile.PL
-         ;;
-         * )
-             %{l_shtool} subst \
-                 -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb\2;' \
--                perl/imap/Makefile.PL
-+                perl/imap/Makefile.PL perl/sieve/managesieve/Makefile.PL
-         ;;
-     esac
- 





More information about the commits mailing list