do not enable browscap by default

1) wastes memory (ini file is always loaded)
2) produces warning if (now optional) browscap.ini is missing

diff --git a/php-ini.patch b/php-ini.patch
index 820e5cab15ac7441ffba636e00f67e56c883ff19..90a83d93478c90cdf53e8f60789a2ebeace2c915 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -197,7 +197,7 @@
  [browscap]
  ; http://php.net/browscap
 -;browscap = extra/browscap.ini
-+browscap = /etc/php/browscap.ini
++;browscap = /usr/share/browscap/php_browscap.ini
  
  [Session]
  ; Handler used to store/retrieve data.

diff --git a/php.spec b/php.spec
index 61e034484627f0e339a4eda1123614c3cf463880..a82138abebbea86bceb4bb301d9b330d3b191ba7 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -2483,8 +2483,6 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
 %endif
 
-%{__sed} -i -e 's#/etc/php/browscap.ini#/usr/share/browscap/php_browscap.ini#' $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-
 # ensure that paths are correct for current php version and arch
 grep -El '/etc/php/|/usr/lib/php/' $RPM_BUILD_ROOT%{_sysconfdir}/*.ini | xargs -r \
 %{__sed} -i -e '