From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sat, 9 Apr 2011 14:18:56 +0000 (+0000)
Subject: - remove bogus ltdl linking on mcrypt (-lltdl is on -lmcrypt not php ext)
X-Git-Tag: auto/th/php-5_3_6-6
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=211aa5601ba5a577a93f8f59bf6850615270dc57;p=packages%2Fphp.git

- remove bogus ltdl linking on mcrypt (-lltdl is on -lmcrypt not php ext)

Changed files:
    mcrypt-libs.patch -> 1.1
    php.spec -> 1.935
---

diff --git a/mcrypt-libs.patch b/mcrypt-libs.patch
new file mode 100644
index 0000000..2bc029c
--- /dev/null
+++ b/mcrypt-libs.patch
@@ -0,0 +1,19 @@
+--- php-5.3.6/ext/mcrypt/config.m4~	2010-01-15 23:02:20.000000000 +0200
++++ php-5.3.6/ext/mcrypt/config.m4	2011-04-09 16:18:07.634572726 +0300
+@@ -36,7 +36,6 @@
+ 
+   PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open, 
+   [
+-    PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD)
+     AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
+   ],[
+     PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
+@@ -48,7 +47,7 @@
+       -L$MCRYPT_DIR/$PHP_LIBDIR
+     ])
+   ],[
+-    -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl
++    -L$MCRYPT_DIR/$PHP_LIBDIR
+   ])
+ 
+   PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/$PHP_LIBDIR, MCRYPT_SHARED_LIBADD)
diff --git a/php.spec b/php.spec
index aaba238..ee16606 100644
--- a/php.spec
+++ b/php.spec
@@ -103,7 +103,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	5
+%define		rel	6
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -185,6 +185,7 @@ Patch57:	bug-52448.patch
 Patch59:	%{name}-systzdata.patch
 Patch60:	%{name}-oracle-instantclient.patch
 Patch61:	%{name}-krb5-ac.patch
+Patch62:	mcrypt-libs.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}
@@ -1863,6 +1864,7 @@ cp php.ini-production php.ini
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
+%patch62 -p1
 
 %{__rm} -r sapi/litespeed
 gzip -dc %{SOURCE15} | tar xf - -C sapi/