packages (PHP_5_2): php/php.spec, php/php-krb5.patch (NEW) - rel 4; fix hei...

[arekm]

Author: arekm                        Date: Fri Oct 22 19:32:45 2010 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- rel 4; fix heimdal build

---- Files affected:
packages/php:
   php.spec (1.805.2.72 -> 1.805.2.73) , php-krb5.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.72 packages/php/php.spec:1.805.2.73
--- packages/php/php.spec:1.805.2.72	Mon Sep  6 22:37:53 2010
+++ packages/php/php.spec	Fri Oct 22 21:32:39 2010
@@ -113,7 +113,7 @@
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
 Version:	5.2.14
-Release:	3
+Release:	4
 Epoch:		4
 License:	PHP
 Group:		Libraries
@@ -188,6 +188,7 @@
 Patch52:	%{name}-libpng.patch
 Patch53:	%{name}-gmp.patch
 Patch54:	fix-test-run.patch
+Patch55:	%{name}-krb5.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1861,6 +1862,7 @@
 %patch52 -p1
 %patch53 -p1
 %patch54 -p1
+%patch55 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -3164,6 +3166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805.2.73  2010/10/22 19:32:39  arekm
+- rel 4; fix heimdal build
+
 Revision 1.805.2.72  2010/09/06 20:37:53  glen
 - rename php-bzip2 -> php-bz2 to match extension name
 - provide obsoleted names: php-domxml

================================================================
Index: packages/php/php-krb5.patch
diff -u /dev/null packages/php/php-krb5.patch:1.1.2.1
--- /dev/null	Fri Oct 22 21:32:45 2010
+++ packages/php/php-krb5.patch	Fri Oct 22 21:32:39 2010
@@ -0,0 +1,12 @@
+--- php-5.2.14/acinclude.m4~	2010-10-22 21:16:27.173736151 +0200
++++ php-5.2.14/acinclude.m4	2010-10-22 21:24:22.776982966 +0200
+@@ -2276,9 +2276,7 @@
+     if test "$PHP_KERBEROS_DIR"; then
+       found_kerberos=yes
+       PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1)
+-      PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)
+       PHP_ADD_LIBRARY(krb5, 1, $1)
+-      PHP_ADD_LIBRARY(k5crypto, 1, $1)
+       PHP_ADD_LIBRARY(com_err,  1, $1)
+       PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
+     fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.72&r2=1.805.2.73&f=u