more paths with this php version in config

diff --git a/php.spec b/php.spec
index c6925bfc05070c836552aeef1096bb4eb2c69c29..947b491e39a6bbdaa8dde9fdec80fba54a605609 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -132,7 +132,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define                orgname php
 %define                php_suffix 54
 
-%define                rel     0.4
+%define                rel     0.5
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -2422,10 +2422,7 @@ cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1
 echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
 ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
 
-sed -e '
-       s#/usr/lib/php#%{php_extensiondir}#
-       s#/etc/php#%{_sysconfdir}#
-' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
+cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini
@@ -2442,6 +2439,12 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
 %endif
 
+# ensure that paths are correct for current php version and arch
+%{__sed} -i -e '
+       s#/usr/lib/php#%{php_extensiondir}#
+       s#/etc/php#%{_sysconfdir}#
+' $RPM_BUILD_ROOT%{_sysconfdir}/*.ini
+
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
 cp -p conf.d/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.d