gunnar: server/php Makefile,1.23,1.24 kolab.patch,1.16,1.17

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Update to PHP 5.3.1.

with-spl is obsolete as this is always activated now. The kolabd and PHPUnit packages still need to get fixed for that.
with-mhash is replaced by with-hash. The kolabd package still needs to be fixed for that.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	9 Jul 2009 16:02:01 -0000	1.23
+++ Makefile	23 Dec 2009 23:27:16 -0000	1.24
@@ -1,46 +1,28 @@
-include ../Base.mk
+include ../make-helper/kolab.mk
 
 PACKAGE=php
-VERSION=5.2.8
-RELEASE=20081209
-KOLABRELEASE=20081209_kolab3
-
-PATCHES=../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
-        ../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch \
-        kolab.patch
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
-
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
-
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < 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' \
-	--define 'with_mbstring yes' --define 'with_mbregex yes' --define 'with_gd yes' \
-	--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_hash yes' \
-	--define 'with_json yes'
+DOWNLOAD_VERSION=5.3.1
+OPENPKG_RELEASE=20091129
+VERSION=5.3.1
+RELEASE=20091129_kolab1
 
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm .
+SOURCE_URL=http://www.php.net/distributions
+SOURCE_0=php-5.3.1.tar.gz
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES=patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
+        patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch \
 
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+EXTRA=$(PATCHES) kolab.patch
 
-.PHONY: clean
-clean:
-	rm -f $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
+              --define 'with_pear yes' --define 'with_gettext yes' \
+              --define 'with_dom yes' --define 'with_mcrypt yes' --define 'with_iconv yes' \
+              --define 'with_mbstring yes' --define 'with_mbregex yes' --define 'with_gd yes' \
+              --define 'with_imap yes' --define 'with_ssl yes' --define 'with_ctype yes' \
+              --define 'with_openldap yes' --define 'with_hash 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_hash yes' \
+              --define 'with_json yes'
 
-.PHONY: install
-install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
-	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
+include ../make-helper/package.mk
+include ../make-helper/openpkg-patched.mk

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- kolab.patch	16 Mar 2009 18:04:55 -0000	1.16
+++ kolab.patch	23 Dec 2009 23:27:16 -0000	1.17
@@ -9,8 +9,8 @@
  Group:        Language
  License:      PHP
  Version:      %{V_php}
--Release:      20081209
-+Release:      20081209_kolab3
+-Release:      20091129
++Release:      20091129_kolab1
  
  #   package options
  %option       with_suhosin              no
@@ -23,13 +23,12 @@
  %option       with_json                 no
  %option       with_mbregex              no
  %option       with_mbstring             no
-@@ -133,7 +134,8 @@
- Source2:      php.ini
- Source3:      http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
+@@ -138,6 +140,7 @@
  Patch0:       http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
--Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
+-Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php_kolab}_Annotations.patch
 +Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php}_Annotations.patch
-+Patch2:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php}_myrights.patch
+ Patch2:       php.patch
++Patch3:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php}_myrights.patch
  
  #   build information
  Prefix:       %{l_prefix}
@@ -41,7 +40,7 @@
 +    %patch -p1 -P 1
 +%endif
 +%if "%{with_imap_myrights}" == "yes"
-+    %patch -p1 -P 2
++    %patch -p1 -P 3
  %endif
  
  %build