steffen: server/apache Makefile, 1.16, 1.16.2.1 kolab.patch, 1.5, 1.5.2.1

[cvs at intevation.de]

Author: steffen

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

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

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- Makefile	16 Jun 2005 03:04:13 -0000	1.16
+++ Makefile	19 Jul 2005 21:00:59 -0000	1.16.2.1
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/UPD
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=apache
-VERSION=1.3.31
-RELEASE=2.2.3
+VERSION=1.3.33
+RELEASE=2.4.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- kolab.patch	16 Jun 2005 03:04:13 -0000	1.5
+++ kolab.patch	19 Jul 2005 21:00:59 -0000	1.5.2.1
@@ -4,8 +4,8 @@
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.2.3
-+Release:      2.2.3_kolab2
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes