gunnar: server/php Makefile, 1.18.2.3, 1.18.2.4 kolab.patch, 1.14, 1.14.2.1

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile kolab.patch 
Log Message:
Update to 5.2.13. Activated modules hash, json, tokenizer (as already done in HEAD)

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -d -r1.18.2.3 -r1.18.2.4
--- Makefile	9 Nov 2009 17:08:44 -0000	1.18.2.3
+++ Makefile	21 Apr 2010 14:53:18 -0000	1.18.2.4
@@ -1,7 +1,8 @@
 include ../kolab.mk
 
 PACKAGE=php
-VERSION=5.2.8
+OLD_VERSION=5.2.8
+VERSION=5.2.13
 RELEASE=20081209
 KOLABRELEASE=20081209_kolab2
 
@@ -11,12 +12,13 @@
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch $(PATCHES) Makefile
+	$(RPM) -ihv $(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
+	cd $(KOLABRPMSRC)/$(PACKAGE) && rm php-$(OLD_VERSION).tar.bz2 && wget http://www.php.net/distributions/php-$(VERSION).tar.bz2 \
+	  && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 	--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
 	--define 'with_pear yes' --define 'with_spl yes' --define 'with_gettext yes' \
 	--define 'with_dom yes' --define 'with_mcrypt yes' --define 'with_iconv yes' \
@@ -24,11 +26,12 @@
 	--define 'with_imap yes' --define 'with_ssl yes' --define 'with_ctype yes' \
 	--define 'with_openldap yes' --define 'with_mhash yes' --define 'with_zlib yes' \
 	--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
-	--define 'with_sqlite yes' --define 'with_spl yes'
+	--define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \
+	--define 'with_json yes' --define 'with_tokenizer yes'
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm:
+	wget -c $(OPENPKGURI)/$(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm
 
 .PHONY: dist
 dist: all

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- kolab.patch	9 Feb 2009 10:08:25 -0000	1.14
+++ kolab.patch	21 Apr 2010 14:53:19 -0000	1.14.2.1
@@ -3,8 +3,17 @@
 RCS file: /v/openpkg/cvs/openpkg-src/php/php.spec,v
 retrieving revision 1.183
 diff -u -B -r1.183 php.spec
---- php.spec	11 May 2008 08:31:26 -0000	1.183
-+++ php.spec	13 May 2008 14:58:33 -0000
+--- php.spec   11 May 2008 08:31:26 -0000 1.183
++++ php.spec   13 May 2008 14:58:33 -0000
+@@ -22,7 +22,7 @@
+ ##
+ 
+ #   package versions
+-%define       V_php                     5.2.8
++%define       V_php                     5.2.13
+ %define       V_php_suhosin_p           5.2.7-0.9.6.3
+ %define       V_php_suhosin_e           0.9.27
+ %define       V_php_kolab               5.2.6
 @@ -39,7 +39,7 @@
  Group:        Language
  License:      PHP