packages: iceweasel/iceweasel.spec - __rm, not __rm -f - plain rm (-f) in h...

[qboosh]

Author: qboosh                       Date: Sat Mar 12 06:19:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- __rm, not __rm -f
- plain rm (-f) in heredoc script

---- Files affected:
packages/iceweasel:
   iceweasel.spec (1.126 -> 1.127) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.126 packages/iceweasel/iceweasel.spec:1.127
--- packages/iceweasel/iceweasel.spec:1.126	Fri Mar  4 12:30:06 2011
+++ packages/iceweasel/iceweasel.spec	Sat Mar 12 07:19:45 2011
@@ -307,7 +307,7 @@
 %endif
 
 %if %{without xulrunner}
-%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 %endif
 
@@ -324,7 +324,7 @@
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
 
 %if %{with xulrunner}
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/run-mozilla.sh
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/run-mozilla.sh
 %endif
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
@@ -333,7 +333,7 @@
 cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 #!/bin/sh
 umask 022
-%{__rm} %{_libdir}/%{name}/components/{compreg,xpti}.dat
+rm -f %{_libdir}/%{name}/components/{compreg,xpti}.dat
 
 # it attempts to touch files in $HOME/.mozilla
 # beware if you run this with sudo!!!
@@ -343,7 +343,7 @@
 
 %{_libdir}/%{name}/iceweasel -register
 
-%{__rm} -rf $HOME
+rm -rf $HOME
 EOF
 chmod 755 $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 
@@ -526,6 +526,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.127  2011/03/12 06:19:45  qboosh
+- __rm, not __rm -f
+- plain rm (-f) in heredoc script
+
 Revision 1.126  2011/03/04 11:30:06  lisu
 - up to 3.6.15
 - use __rm macro
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.126&r2=1.127&f=u