steffen: server/php Makefile,NONE,1.1 kolab.patch,NONE,1.1

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv23783/php

Added Files:
	Makefile kolab.patch 
Log Message:
integrated patches from Martin. Had to upgrade to imap-2004c-2.3.0 because patch was rejected by 2004a-2.2.0

--- NEW FILE: Makefile ---
ifeq "x$(KOLABPKGURI)" "x"
  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/UPD
endif
ifeq "x$(KOLABRPMSRC)" "x"
  KOLABRPMSRC = /kolab/RPM/SRC
endif
ifeq "x$(KOLABCVSDIR)" "x"
  KOLABCVSDIR = $(CURDIR)
endif

PACKAGE=php
VERSION=4.3.9
RELEASE=2.2.2

RPM=/kolab/bin/openpkg rpm
 
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

	cp $(KOLABCVSDIR)/php-getacl-backport.patch $(KOLABRPMSRC)/$(PACKAGE)/
	cp $(KOLABCVSDIR)/php-imap-annotation.patch $(KOLABRPMSRC)/$(PACKAGE)/
	cp $(KOLABCVSDIR)/php-imap-status-current.patch $(KOLABRPMSRC)/$(PACKAGE)/

	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
		--define 'with_zlib yes' \
		--define 'with_gdbm yes' \
		--define 'with_gettext yes' \
		--define 'with_imap yes' \
		--define 'with_openldap yes' \
		--define 'with_pear yes' \
		--define 'with_xml yes' \
		--define 'with_dom yes' \
		--define 'with_ssl yes' \
		--define 'with_mbstring yes'

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

clean:
	rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)* 

--- NEW FILE: kolab.patch ---
diff -up ../php.orig/php.spec ./php.spec
--- ../php.orig/php.spec	2004-12-16 21:20:01.000000000 +0100
+++ ./php.spec	2005-06-16 04:12:51.000000000 +0200
@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Language
 License:      PHP
 Version:      %{V_php}
-Release:      2.2.2
+Release:      2.2.2_kolab
 
 #   package options
 %option       with_bc                   no
@@ -105,6 +105,9 @@ Source0:      http://static.php.net/www.
 Source1:      php.ini
 Patch0:       http://www.hardened-php.net/hardened-php-%{V_php_hardened}.patch.gz
 Patch1:       php.patch
+Patch2:       php-getacl-backport.patch
+Patch3:       php-imap-annotation.patch
+Patch4:       php-imap-status-current.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -258,6 +261,9 @@ AutoReqProv:  no
     %patch -p1 -P 0
 %endif
     %patch -p0 -P 1
+    %patch -p1 -P 2
+    %patch -p1 -P 3
+    %patch -p0 -P 4
     %{l_shtool} subst \
         %{l_value -s l_prefix l_rpm l_rpmtool} \
         scripts/phpize.in