packages: php/php.spec, php/php-krb5-ac.patch (NEW) - rel 9 - heimdal 1.4 d...

[baggins]

Author: baggins                      Date: Tue Oct 19 21:00:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 9
- heimdal 1.4 does not need any cflags for libgssapi

---- Files affected:
packages/php:
   php.spec (1.898 -> 1.899) , php-krb5-ac.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.898 packages/php/php.spec:1.899
--- packages/php/php.spec:1.898	Sat Oct 16 00:23:13 2010
+++ packages/php/php.spec	Tue Oct 19 23:00:01 2010
@@ -105,7 +105,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel		8
+%define		rel		9
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -188,6 +188,7 @@
 Patch58:	bug-52533.patch
 Patch59:	%{name}-systzdata.patch
 Patch60:	%{name}-oracle-instantclient.patch
+Patch61:	%{name}-krb5-ac.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}
@@ -1851,6 +1852,7 @@
 %patch58 -p1
 %patch59 -p1
 %patch60 -p1
+%patch61 -p1
 
 %if "%{pld_release}" != "ac"
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
@@ -3165,6 +3167,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.899  2010/10/19 21:00:01  baggins
+- rel 9
+- heimdal 1.4 does not need any cflags for libgssapi
+
 Revision 1.898  2010/10/15 22:23:13  pawelz
 - use lsapi from litespeedtech.com[1]. It is more recent than one bundled with php
   sources. Moreover it is recomended[2] by litespeed support.

================================================================
Index: packages/php/php-krb5-ac.patch
diff -u /dev/null packages/php/php-krb5-ac.patch:1.1
--- /dev/null	Tue Oct 19 23:00:06 2010
+++ packages/php/php-krb5-ac.patch	Tue Oct 19 23:00:01 2010
@@ -0,0 +1,11 @@
+--- php-5.3.3/acinclude.m4.orig	2010-10-19 21:38:42.000000000 +0200
++++ php-5.3.3/acinclude.m4	2010-10-19 22:53:11.792893220 +0200
+@@ -2252,7 +2252,7 @@
+     KERBEROS_LIBS=`$KRB5_CONFIG --libs gssapi`
+     KERBEROS_CFLAGS=`$KRB5_CONFIG --cflags gssapi`
+ 
+-    if test -n "$KERBEROS_LIBS" && test -n "$KERBEROS_CFLAGS"; then
++    if test -n "$KERBEROS_LIBS" || test -n "$KERBEROS_CFLAGS"; then
+       found_kerberos=yes
+       PHP_EVAL_LIBLINE($KERBEROS_LIBS, $1)
+       PHP_EVAL_INCLINE($KERBEROS_CFLAGS)
================================================================

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