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 b170d5ef78f1fdda87d68f2618adf04aa59b2389..f336bc40bfdda667f16474c204f09bc01e7a8442 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -205,7 +205,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 7bc3e8d2d8a7a34b18879dadd97a46d8eb69e816..151e91a9943c0050a5766bace7aa2445a5f132dd 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -2593,8 +2593,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 '