- with --enable-zend-multibyte mbstring needs to be linked static:

  Cannot load /etc/apache/modules/libphp5.so into server: /etc/apache/modules/libphp5.so: undefined symbol: php_mb_set_zend_encoding
  so disable it again (and add bcond)

Changed files:
    php.spec -> 1.800

diff --git a/php.spec b/php.spec
index ced55f7c55e1d6e3f0c6ec5d55224e0f4addc588..1f6de3b3f2a67544362e5911bbbc1c466900d1a4 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -19,6 +19,7 @@
 %bcond_with    oci8            # with Oracle oci8 extension module     (BR: proprietary libs)
 %bcond_with    system_gd       # with system gd (we prefer internal since it enables few more features)
 %bcond_with    gd_jis_conv     # causes imagettfbbox(): any2eucjp(): invalid code in input string when internal gd used
+%bcond_with    zend_multibyte          # enable zend multibyte, mbstring can't be shared then anymore
 %bcond_without curl            # without CURL extension module
 %bcond_without filter          # without filter extension module
 %bcond_without imap            # without IMAP extension module
@@ -418,6 +419,7 @@ Requires:   glibc >= 6:2.3.5
 Requires:      php-dirs
 Provides:      php(date)
 Provides:      php(libxml)
+%{?with_zend_multibyte:Provides:       php(mbstring)}
 Provides:      php(modules_api) = %{php_api_version}
 Provides:      php(overload)
 %{?with_pcre:Provides: php(pcre)}
@@ -428,7 +430,8 @@ Provides:   php(spl)
 Provides:      php(standard)
 Provides:      php(zend_extension_api) = %{zend_extension_api}
 Provides:      php(zend_module_api) = %{zend_module_api}
-%{?with_pcre:Provides: php-pcre}
+%{?with_zend_multibyte:Provides:       php-mbstring = %{epoch}:%{version}-%{release}}
+%{?with_pcre:Provides: php-pcre = %{epoch}:%{version}-%{release}}
 Provides:      php5(debug) = %{php_debug}
 Provides:      php5(thread-safety) = %{zend_zts}
 Obsoletes:     php-pcre < 4:5.2.0
@@ -1783,7 +1786,7 @@ for sapi in $sapis; do
        --%{!?debug:dis}%{?debug:en}able-debug \
        %{?with_zts:--enable-maintainer-zts} \
        %{?with_suhosin:--enable-suhosin} \
-       --enable-zend-multibyte \
+       %{?with_zend_multibyte:--enable-zend-multibyte} \
        --enable-inline-optimization \
        --enable-bcmath=shared \
        --enable-calendar=shared \
@@ -1796,7 +1799,7 @@ for sapi in $sapis; do
        %{?with_gd_jis_conv:--enable-gd-jis-conv} \
        --enable-libxml \
        --enable-magic-quotes \
-       --enable-mbstring=shared,all \
+       --enable-mbstring=%{?!with_zend_multibyte:shared,}all \
        --enable-mbregex \
        --enable-pcntl=shared \
        --enable-pdo=shared \
@@ -2580,10 +2583,12 @@ fi
 %attr(755,root,root) %{php_extensiondir}/ldap.so
 %endif
 
+%if %{without zend_multibyte}
 %files mbstring
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mbstring.ini
 %attr(755,root,root) %{php_extensiondir}/mbstring.so
+%endif
 
 %files mcrypt
 %defattr(644,root,root,755)