steffen: server/apache Makefile,1.24,1.25 kolab.patch,1.10,1.11

cvs at kolab.org cvs at kolab.org
Thu Mar 15 15:12:46 CET 2007


Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
remove dep on gdbm

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile	2 Mar 2007 04:33:00 -0000	1.24
+++ Makefile	15 Mar 2007 14:12:44 -0000	1.25
@@ -14,7 +14,7 @@
 PACKAGE=apache
 VERSION=1.3.33
 RELEASE=2.5.6
-KOLABRELEASE=2.5.6_kolab
+KOLABRELEASE=2.5.6_kolab2
 
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
@@ -30,6 +30,7 @@
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
+		--define 'with_gdbm_ndbm no' \
 		--define 'with_mod_auth_ldap yes' \
 		--define 'with_mod_dav yes' \
 		--define 'with_mod_php yes' \

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab.patch	3 Nov 2006 17:55:45 -0000	1.10
+++ kolab.patch	15 Mar 2007 14:12:44 -0000	1.11
@@ -1,15 +1,15 @@
---- 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 @@
+--- apache.spec.orig	2007-03-15 14:43:36.000000000 +0100
++++ apache.spec	2007-03-15 14:47:40.000000000 +0100
+@@ -65,7 +65,7 @@ Class:        BASE
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
 -Release:      2.5.6
-+Release:      2.5.6_kolab
++Release:      2.5.6_kolab2
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -214,6 +214,10 @@
+@@ -214,6 +214,10 @@ Patch1:       apache.patch.modowa
  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 @@
+@@ -527,6 +531,9 @@ AutoReqProv:  no
  %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 @@
+@@ -561,6 +568,7 @@ AutoReqProv:  no
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14
@@ -38,3 +38,11 @@
  %endif
  %if "%{with_mod_auth_radius}" == "yes"
      %setup -q -T -D -a 15
+@@ -1129,6 +1137,7 @@ AutoReqProv:  no
+ %if "%{with_mod_dav}" == "yes"
+           --activate-module=src/modules/dav/libdav.a \
+ %endif
++          --disable-module=auth_dbm \
+           --disable-rule=EXPAT \
+ %if "%{with_shared_core}" == "yes"
+           --enable-rule=SHARED_CORE \





More information about the commits mailing list