This commit was manufactured by cvs2git to create tag 'auto-ac-php-4_3_4-5'.

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index c2f6ea12d2ec62cf95cd5c826686b97b6b5589cb..fb31ee981e3eaaa6202eefe82fd14fc330f76ad8 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -62,7 +62,7 @@ Summary(ru):  PHP 
 Summary(uk):   PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
 Version:       4.3.4
-Release:       3
+Release:       5
 Epoch:         3
 Group:         Libraries
 License:       PHP
@@ -109,6 +109,7 @@ Patch29:    %{name}-sybase-fix.patch
 Patch30:       %{name}-mssql-fix.patch
 Patch31:       %{name}-phpize_fixes.patch
 Patch32:       %{name}-db42.patch
+Patch33:       %{name}-lib64.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
@@ -201,6 +202,7 @@ Obsoletes:  apache-mod_php
 %define                _sysconfdir     /etc/php
 %define                extensionsdir   %{_libdir}/php
 %define                httpdir         /home/services/httpd
+%define                _ulibdir        %{_prefix}/lib
 
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
@@ -1507,6 +1509,9 @@ cp php.ini-dist php.ini
 %patch30 -p1
 %patch31 -p0
 %patch32 -p1
+%ifarch amd64
+%patch33 -p1
+%endif
 
 %build
 CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"
@@ -1689,6 +1694,10 @@ cp -f Zend/LICENSE{,.Zend}
 # Directories created for pear:
 install -d $RPM_BUILD_ROOT%{php_pear_dir}/{Archive,Console,Crypt,HTML/Template,Image,Net,Science,XML}
 
+%ifarch amd64
+ln -sf ../../lib/%{name}/build $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+%endif
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp4.la
 
 %clean
@@ -2354,6 +2363,9 @@ fi
 %{_libdir}/libphp_common.la
 %{_includedir}/php
 %{_libdir}/php/build
+%ifarch amd64
+%{_ulibdir}/php/build
+%endif
 
 %files bcmath
 %defattr(644,root,root,755)