steffen: server/apache Makefile,1.13,1.14 kolab.patch,1.2,1.3

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Switched to OpenPKG-2.2!

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	19 Nov 2004 13:01:26 -0000	1.13
+++ Makefile	22 Nov 2004 23:26:26 -0000	1.14
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.1/UPD
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/UPD
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,7 +9,7 @@
 endif
 
 VERSION=1.3.31
-RELEASE=2.1.6
+RELEASE=2.2.1
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.patch	19 Nov 2004 13:01:26 -0000	1.2
+++ kolab.patch	22 Nov 2004 23:26:26 -0000	1.3
@@ -1,27 +1,27 @@
---- apache.spec.orig	2004-10-13 03:38:50.000000000 +0200
-+++ apache.spec	2004-10-13 03:39:33.000000000 +0200
+--- /kolab/RPM/SRC/apache/apache.spec.orig	2004-10-29 13:13:01.000000000 +0200
++++ /kolab/RPM/SRC/apache/apache.spec	2004-11-22 14:00:41.000000000 +0100
 @@ -66,7 +66,7 @@ Class:        BASE
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.1.6
-+Release:      2.1.6_kolab
+-Release:      2.2.1
++Release:      2.2.1_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -213,6 +213,7 @@ Patch1:       apache.patch.modowa
- Patch2:       http://www.hardened-php.net/hardened-php-%{V_mod_php}-%{V_mod_php_hardened}.patch.gz
- Patch3:       apache.patch.modssl
- Patch4:       apache.patch.php
-+Patch5:       mod_auth_ldap.patch
+@@ -213,6 +213,7 @@ Patch0:       apache.patch
+ Patch1:       apache.patch.modowa
+ Patch2:       apache.patch.php
+ Patch3:       http://www.hardened-php.net/hardened-php-%{V_mod_php_hardened}.patch.gz
++Patch4:       mod_auth_ldap.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -553,6 +554,7 @@ AutoReqProv:  no
+@@ -552,6 +553,7 @@ AutoReqProv:  no
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14
-+    %patch -p0 -P 5
++    %patch -p0 -P 4
  %endif
  %if "%{with_mod_auth_radius}" == "yes"
      %setup -q -T -D -a 15