[packages/php] do not enable browscap by default

glen glen at pld-linux.org
Wed Feb 4 21:28:56 CET 2015


commit 38f792ab3501775cd5cda2b91594f2e0ff0a6669
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Feb 4 21:07:49 2015 +0200

    do not enable browscap by default
    
    1) wastes memory (ini file is always loaded)
    2) produces warning if (now optional) browscap.ini is missing

 php-ini.patch | 2 +-
 php.spec      | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 3dac235..7fe0942 100644
--- a/php.spec
+++ b/php.spec
@@ -2606,8 +2606,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 '
diff --git a/php-ini.patch b/php-ini.patch
index 9d1ace5..19d3eb3 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -203,7 +203,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.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/38f792ab3501775cd5cda2b91594f2e0ff0a6669



More information about the pld-cvs-commit mailing list