- system pcre

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index dc9ac5d15707557e133d747f0edf135455664bca..6389a1cd9b7c5acd6510282694e90ed4ce2fa822 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -76,14 +76,13 @@ Summary(pt_BR):     A linguagem de script PHP
 Summary(ru):   PHP ÷ÅÒÓÉÉ 5 - ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ
 Summary(uk):   PHP ÷ÅÒÓ¦§ 5 - ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
-Version:       5.1.0
-%define        _version %{version}RC1
-Release:       0.1%{?with_hardening:hardened}
+Version:       5.0.4
+Release:       10.1%{?with_hardening:hardened}
 Epoch:         4
 Group:         Libraries
 License:       PHP
-Source0:       http://www.php.net/distributions/%{name}-%{_version}.tar.bz2
-# Source0-md5: c7aebeb915e6f898559365cf82493ad0
+Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.bz2
+# Source0-md5: fb1aac107870f897d26563a9cc5053c0
 Source1:       FAQ.%{name}
 Source2:       zend.gif
 Source3:       %{name}-module-install
@@ -174,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}
@@ -1430,7 +1430,7 @@ compression support to PHP.
 Modu³ PHP umo¿liwiaj±cy u¿ywanie kompresji zlib.
 
 %prep
-%setup -q -n %{name}-%{_version}
+%setup -q
 # this patch is broken by design, breaks --enable-versioning for example
 %patch0 -p1
 %patch1 -p1
@@ -1441,23 +1441,23 @@ Modu
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-#%patch9 -p1
+%patch9 -p1
 cp php.ini-dist php.ini
 %patch10 -p1
 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
 # conditionally...
 %patch11 -p1
 %patch12 -p1
-#%patch13 -p1
+%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-#%patch20 -p1
-#%patch21 -p1
-#%patch28 -p1
+%patch20 -p1
+%patch21 -p1
+%patch28 -p1
 %if "%{_lib}" == "lib64"
 %patch22 -p1
 %endif
@@ -1465,8 +1465,8 @@ cp php.ini-dist php.ini
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-#%patch27 -p1
-#%patch29 -p1
+%patch27 -p1
+%patch29 -p1
 
 %if %{with hardening}
 zcat %{SOURCE9} | patch -p1
@@ -1613,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 \