[packages/php/PHP_5_3] keep backups and original files whenever it's so easy

glen glen at pld-linux.org
Sun May 31 16:04:01 CEST 2015


commit 04e197f809577cfe2f77517b1e6d5b4e3eb4b7af
Author: Tomasz Pala <gotar at pld-linux.org>
Date:   Sun May 31 14:23:59 2015 +0200

    keep backups and original files whenever it's so easy

 php.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 632429d..7f7dc2d 100644
--- a/php.spec
+++ b/php.spec
@@ -2715,7 +2715,7 @@ fi
 %service %{name}-fpm restart
 
 %preun fpm
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
 	%service %{name}-fpm stop
 	/sbin/chkconfig --del %{name}-fpm
 fi
@@ -2765,8 +2765,8 @@ for f in /etc/php/*.ini.rpmsave /etc/php/*.d/*.ini.rpmsave; do
 	fn=${fn%.rpmsave}
 	nf=%{_sysconfdir}/$dn/$fn
 	test -f "$nf" || continue
-	cp -vf $nf{,.rpmnew}
-	mv -vf $f $nf
+	cp -vfb $nf{,.rpmnew}
+	cp -vfb $f $nf
 	%{__sed} -i -e '
 		s#%{_libdir}/php#%{_libdir}/%{name}#
 		s#/etc/php#%{_sysconfdir}#
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list