[packages/php/PHP_5_6] fix all /etc/php matches

glen glen at pld-linux.org
Wed Dec 21 21:01:08 CET 2016


commit 59064697fd29b5d0acc9ce550307d741864df255
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Dec 21 22:00:56 2016 +0200

    fix all /etc/php matches

 php.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/php.spec b/php.spec
index ece6480..daa95d5 100644
--- a/php.spec
+++ b/php.spec
@@ -2757,8 +2757,8 @@ touch $RPM_BUILD_ROOT%{_sbindir}/php-fpm
 %endif
 
 %{__sed} -i -e '
-	s#/usr/lib/php#%{php_extensiondir}#
-	s#/etc/php/#%{_sysconfdir}/#
+	s#/usr/lib/php#%{php_extensiondir}#g
+	s#/etc/php/#%{_sysconfdir}/#g
 	s#@processname@#%{name}-fpm#g
 ' $RPM_BUILD_ROOT{/etc/{rc.d/init.d/%{name}-fpm,logrotate.d/%{name}-fpm},%{_sysconfdir}/php-fpm.conf,%{_sysconfdir}/fpm.d/www.conf}
 %endif
@@ -2797,8 +2797,8 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.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 '
-	s#/usr/lib/php#%{php_extensiondir}#
-	s#/etc/php#%{_sysconfdir}#
+	s#/usr/lib/php#%{php_extensiondir}#g
+	s#/etc/php/#%{_sysconfdir}/#g
 '
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/59064697fd29b5d0acc9ce550307d741864df255



More information about the pld-cvs-commit mailing list