From 4368690bf7c0425927eab3916d316fe95823a40b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 4 Feb 2015 21:07:49 +0200 Subject: [PATCH] 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-ini.patch b/php-ini.patch index b170d5e..f336bc4 100644 --- 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 7bc3e8d..151e91a 100644 --- 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 ' -- 2.44.0