[cups/f19] Use '-f' when using rm in %setup section.

[Tim Waugh]

commit bb8ea4ea6658979d0b59b81c1dd64243790519e0
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Jan 2 17:03:10 2014 +0000

    Use '-f' when using rm in %setup section.
    
    (cherry picked from commit ccb55ae4bccaa211b519aa27a3c05e226b80c563)
    
    Conflicts:
    	cups.spec

 cups.spec |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/cups.spec b/cups.spec
index c1fbc0b..935d7a7 100644
--- a/cups.spec
+++ b/cups.spec
@@ -281,7 +281,7 @@ perl -pi -e "s,^.SILENT:,," Makedefs.in
 f=CREDITS.txt
 mv "$f" "$f"~
 iconv -f MACINTOSH -t UTF-8 "$f"~ > "$f"
-rm "$f"~
+rm -f "$f"~
 
 aclocal -I config-scripts
 autoconf -I config-scripts
@@ -656,6 +656,7 @@ rm -f %{cups_serverbin}/backend/smb
 
 %changelog
 * Tue Mar 11 2014 Tim Waugh <twaugh at redhat.com> - 1:1.6.4-4
+- Use '-f' when using rm in %%setup section.
 - Prevent USB timeouts causing incorrect print output (bug #1026914).
 
 * Thu Nov 14 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.4-3