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

gotar gotar at pld-linux.org
Sun May 31 14:27:46 CEST 2015


commit 8f7b6246d1239645aa2b603b79532685e6b72ee9
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 62ffc7c..9a97327 100644
--- a/php.spec
+++ b/php.spec
@@ -2789,7 +2789,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
@@ -2839,8 +2839,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/4c94999ce1f5d9993e66097930de0ac3057e3453



More information about the pld-cvs-commit mailing list