- rel 1

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 2166c105d0709c332d809c8c221a02f14f2c7fe9..aa056809bec717d0b331b169e952ac80268f666a 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -76,13 +76,13 @@ Summary(pt_BR):     A linguagem de script PHP
 Summary(ru):   PHP ÷ÅÒÓÉÉ 5 - ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ
 Summary(uk):   PHP ÷ÅÒÓ¦§ 5 - ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
-Version:       5.0.4
-Release:       10%{?with_hardening:hardened}
+Version:       5.0.5
+Release:       1%{?with_hardening:hardened}
 Epoch:         4
 Group:         Libraries
 License:       PHP
 Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: fb1aac107870f897d26563a9cc5053c0
+# Source0-md5: b5d4ca75bbb11ee5b830fa67213d9f7f
 Source1:       FAQ.%{name}
 Source2:       zend.gif
 Source3:       %{name}-module-install
@@ -173,6 +173,7 @@ BuildRequires:      ncurses-ext-devel
 %if %{with openssl} || %{with ldap}
 BuildRequires: openssl-devel >= 0.9.7d
 %endif
+%{?with_pcre:BuildRequires:    pcre-devel}
 BuildRequires: pam-devel
 BuildRequires: %{__perl}
 %{?with_msession:BuildRequires:        phoenix-devel}
@@ -1612,7 +1613,7 @@ for sapi in $sapis; do
        %{?with_oci8:--with-oci8=shared} \
        %{?with_openssl:--with-openssl=shared} \
        %{?with_oracle:--with-oracle=shared} \
-       %{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=shared} \
+       %{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=shared,/usr} \
        --with-pear=%{php_pear_dir} \
        %{!?with_pgsql:--without-pgsql}%{?with_pgsql:--with-pgsql=shared,/usr} \
        --with-png-dir=/usr \
@@ -1707,7 +1708,11 @@ libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdi
 
 # install the apache modules' files
 make install-headers install-build install-modules install-programs \
-       INSTALL_ROOT=$RPM_BUILD_ROOT
+       INSTALL_ROOT=$RPM_BUILD_ROOT \
+       phpbuilddir=%{_libdir}/php/build
+
+# as of 5.0.5, phpextdist isn't installed by default
+install scripts/dev/phpextdist $RPM_BUILD_ROOT%{_bindir}
 
 # install CGI
 libtool --silent --mode=install install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php.cgi
@@ -2527,6 +2532,7 @@ fi
 %{_libdir}/libphp_common.la
 %{_includedir}/php
 %{_libdir}/php/build
+%{_mandir}/man1/*
 
 %files bcmath
 %defattr(644,root,root,755)