X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=e6124630c3f9c074d9dcba2b07fdc7439a8c23a7;hb=efd0801ab6e257800daecfc2f1237c7761a4b469;hp=3dac235501780b33be172d5a0da2179f637c310b;hpb=623577a8f29e43d0787622ae4c54edf85f9f13c4;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 3dac235..e612463 100644
--- a/php.spec
+++ b/php.spec
@@ -126,7 +126,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	1
+%define		rel	4
 %define		orgname	php
 %define		ver_suffix 55
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -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 '
@@ -2746,6 +2744,10 @@ done
 %triggerpostun common -- %{name}-common < 4:5.5.20-2, php-common < 4:5.5.20-2
 # switch to browscap package if the ini file has original value
 %{__sed} -i -e 's#%{_sysconfdir}/browscap.ini#/usr/share/browscap/php_browscap.ini#' %{_sysconfdir}/php.ini
+# disable browscap, if optional package not present
+if [ ! -e /usr/share/browscap/php_browscap.ini ]; then
+	%{__sed} -i -e 's#^browscap = /usr/share/browscap/php_browscap.ini#;&#' %{_sysconfdir}/php.ini
+fi
 
 # common macros called at extension post/postun scriptlet
 %define	extension_scripts() \