bh: server/php kolab.patch,1.2,1.3 Makefile,1.2,1.3

[cvs at intevation.de]

Author: bh

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

Modified Files:
	kolab.patch Makefile 
Log Message:
Update to OpenPKG 2.5


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.patch	22 Jul 2005 22:36:14 -0000	1.2
+++ kolab.patch	9 Dec 2005 15:56:24 -0000	1.3
@@ -1,18 +1,17 @@
-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
+--- php.spec.orig	Wed Dec  7 18:26:35 2005
++++ php.spec	Wed Dec  7 18:26:35 2005
+@@ -37,7 +37,7 @@ Class:        BASE
  Group:        Language
  License:      PHP
  Version:      %{V_php}
--Release:      2.4.0
-+Release:      2.4.0_kolab
+-Release:      2.5.2
++Release:      2.5.2_kolab
  
  #   package options
  %option       with_bc                   no
-@@ -105,6 +105,9 @@ Source0:      http://static.php.net/www.
+@@ -104,6 +104,9 @@ Source0:      http://static.php.net/www.
  Source1:      php.ini
- Patch0:       http://www.hardened-php.net/hardened-php-%{V_php_hardened}.patch.gz
+ Patch0:       http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
  Patch1:       php.patch
 +Patch2:       php-getacl-backport.patch
 +Patch3:       php-imap-annotation.patch

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	22 Jul 2005 22:36:14 -0000	1.2
+++ Makefile	9 Dec 2005 15:56:24 -0000	1.3
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/UPD
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=php
-VERSION=4.3.11
-RELEASE=2.4.0
+VERSION=4.4.0
+RELEASE=2.5.2
 
 RPM=/kolab/bin/openpkg rpm