thomas: server/apache Makefile,1.21,1.22 kolab.patch,1.9,1.10

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Updated apache, curl and gzip versions. Adjust release notes and obmtool.conf


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile	20 Dec 2005 09:18:50 -0000	1.21
+++ Makefile	3 Nov 2006 17:55:45 -0000	1.22
@@ -10,8 +10,8 @@
 
 PACKAGE=apache
 VERSION=1.3.33
-RELEASE=2.5.5
-KOLABRELEASE=2.5.5_kolab
+RELEASE=2.5.6
+KOLABRELEASE=2.5.6_kolab
 
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab.patch	15 Dec 2005 16:26:53 -0000	1.9
+++ kolab.patch	3 Nov 2006 17:55:45 -0000	1.10
@@ -1,15 +1,15 @@
---- apache.spec.orig	Wed Dec  7 18:43:26 2005
-+++ apache.spec	Wed Dec  7 18:43:26 2005
-@@ -65,7 +65,7 @@ Class:        BASE
+--- apache.spec.orig	2006-11-03 18:36:39.283198000 +0100
++++ apache.spec	2006-11-03 18:36:54.491277155 +0100
+@@ -65,7 +65,7 @@
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.5.5
-+Release:      2.5.5_kolab
+-Release:      2.5.6
++Release:      2.5.6_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -214,6 +214,10 @@ Patch1:       apache.patch.modowa
+@@ -214,6 +214,10 @@
  Patch2:       apache.patch.php
  Patch3:       http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
  Patch4:       apache.patch.suphp
@@ -20,7 +20,7 @@
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -527,6 +531,9 @@ AutoReqProv:  no
+@@ -527,6 +531,9 @@
  %if "%{with_mod_php_hardened}" == "yes"
        %patch -p1 -P 3
  %endif
@@ -30,7 +30,7 @@
      ) || exit $?
  %endif
  %if "%{with_mod_dav}" == "yes"
-@@ -561,6 +568,7 @@ AutoReqProv:  no
+@@ -561,6 +568,7 @@
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14