steffen: server/apache Makefile,1.8,1.9 apache.spec.patch,1.1,1.2

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	Makefile apache.spec.patch 
Log Message:
adapt to new apache rpm

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	9 Jun 2003 12:45:26 -0000	1.8
+++ Makefile	2 Jul 2004 11:20:09 -0000	1.9
@@ -8,11 +8,22 @@
   KOLABCVSDIR = $(CURDIR)
 endif
 
+PKG=apache-1.3.31-20040628.src.rpm
 
-all:
-        
-	rpm -ihv $(KOLABPKGURI)/apache-1.3.27-20030605.src.rpm	
-	cd $(KOLABRPMSRC)/apache && patch < $(KOLABCVSDIR)/server/apache/apache.spec.patch && rpm -ba apache.spec --define 'with_mod_ssl yes' --define 'with_mod_dav yes' --define 'with_mod_auth_ldap yes' --define 'with_mod_php yes' --define 'with_mod_php_ftp yes' --define 'with_mod_php_xml yes' --define 'with_mod_php_dom yes' --define 'with_mod_php_openldap yes' --define 'with_mod_php_imap yes' --define 'with_mod_php yes' --define 'with_mod_php_gettext yes'
+#RPM=/kolab/bin/rpm
+RPM=/kolab/libexec/openpkg/rpm
+
+$(PKG):
+	wget -c 4(PKG)
+
+srcinstall: $(PKG)
+	$(RPM) -ihv $(PKG)
+
+srcpkg: srcinstall
+	cd $(KOLABRPMSRC)/apache && patch < $(KOLABCVSDIR)/apache.spec.patch && $(RPM) -bs apache.spec
+
+all: srcinstall
+	cd $(KOLABRPMSRC)/apache && patch < $(KOLABCVSDIR)/server/apache/apache.spec.patch && $(RPM) -ba apache.spec --define 'with_mod_ssl yes' --define 'with_mod_dav yes' --define 'with_mod_auth_ldap yes' --define 'with_mod_php yes' --define 'with_mod_php_ftp yes' --define 'with_mod_php_xml yes' --define 'with_mod_php_dom yes' --define 'with_mod_php_openldap yes' --define 'with_mod_php_imap yes' --define 'with_mod_php yes' --define 'with_mod_php_gettext yes'
 
 
 clean: 

Index: apache.spec.patch
===================================================================
RCS file: /kolabrepository/server/apache/apache.spec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apache.spec.patch	4 Jun 2003 09:58:34 -0000	1.1
+++ apache.spec.patch	2 Jul 2004 11:20:09 -0000	1.2
@@ -1,7 +1,7 @@
---- apache.spec.orig	2003-06-03 20:34:18.000000000 +0200
-+++ apache.spec	2003-06-03 20:35:36.000000000 +0200
-@@ -550,7 +550,6 @@
-           --enable-versioning \
+--- apache.spec.orig	2004-07-02 13:05:39.000000000 +0200
++++ apache.spec	2004-07-02 13:09:57.000000000 +0200
+@@ -844,7 +844,6 @@ AutoReqProv:  no
+           --with-crack=%{l_prefix} \
  %endif
            --disable-cli \
 -          --without-pear \