]> git.pld-linux.org Git - packages/php.git/commitdiff
- rel 4; fix heimdal build
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Fri, 22 Oct 2010 19:32:39 +0000 (19:32 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    php-krb5.patch -> 1.1.2.1
    php.spec -> 1.805.2.73

php-krb5.patch [new file with mode: 0644]
php.spec

diff --git a/php-krb5.patch b/php-krb5.patch
new file mode 100644 (file)
index 0000000..939d375
--- /dev/null
@@ -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
index eb3b489181c01c053f1272f1b0539402c8e6b833..2f4208e73cc823742389064537c517cce730a04b 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ Summary(ru.UTF-8):  PHP Версии 5 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          php
 Version:       5.2.14
-Release:       3
+Release:       4
 Epoch:         4
 License:       PHP
 Group:         Libraries
@@ -187,6 +187,7 @@ Patch51:    spl-shared.patch
 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}
@@ -1860,6 +1861,7 @@ done
 %patch52 -p1
 %patch53 -p1
 %patch54 -p1
+%patch55 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
This page took 0.082258 seconds and 4 git commands to generate.