15eccb Use rm -f in gnulib-tests (gnulib-tests-rm-f patch)

Authored and Committed by jskarvad 13 years ago
    Use rm -f in gnulib-tests (gnulib-tests-rm-f patch)
    Resolves: rhbz#716330
    
        
grep-2.9-gnulib-tests-rm-f.patch ADDED
@@ -0,0 +1,112 @@
1
+ diff -up grep-2.9/gnulib-tests/test-update-copyright.sh.orig grep-2.9/gnulib-tests/test-update-copyright.sh
2
+ --- grep-2.9/gnulib-tests/test-update-copyright.sh.orig 2011-01-03 21:57:35.000000000 +0100
3
+ +++ grep-2.9/gnulib-tests/test-update-copyright.sh 2011-07-11 11:39:18.000000000 +0200
4
+ @@ -231,7 +231,7 @@ Copyright (C) 1990-2005, 2007-2009 Acme,
5
+ # Software Foundation, Inc.
6
+ EOF
7
+
8
+ -rm $TMP*
9
+ +rm -f $TMP*
10
+
11
+ ## -------------- ##
12
+ ## Current year. ##
13
+ @@ -257,7 +257,7 @@ compare /dev/null $TMP-stderr || exit 1
14
+ compare - $TMP <<EOF || exit 1
15
+ '\" Copyright (C) 2006, $YEAR Free Software Foundation, Inc.
16
+ EOF
17
+ -rm $TMP*
18
+ +rm -f $TMP*
19
+
20
+ ## ------------------ ##
21
+ ## Surrounding text. ##
22
+ @@ -281,7 +281,7 @@ dnl Undisturbed text.
23
+ dnl Copyright (C) 1989, 2010 Free Software Foundation, Inc.
24
+ dnl Undisturbed text.
25
+ EOF
26
+ -rm $TMP*
27
+ +rm -f $TMP*
28
+
29
+ ## --------------- ##
30
+ ## Widest prefix. ##
31
+ @@ -310,7 +310,7 @@ compare - $TMP <<EOF || exit 1
32
+ #### Copyright (C) 1976-1988, 1999-2008, 2010-2011 Free Software
33
+ #### Foundation, Inc.
34
+ EOF
35
+ -rm $TMP*
36
+ +rm -f $TMP*
37
+
38
+ ## ------------------- ##
39
+ ## Prefix too large. ##
40
+ @@ -333,7 +333,7 @@ compare - $TMP <<EOF || exit 1
41
+ #### 1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
42
+ #### 2008 Free Software Foundation, Inc.
43
+ EOF
44
+ -rm $TMP*
45
+ +rm -f $TMP*
46
+
47
+ ## ------------- ##
48
+ ## Blank lines. ##
49
+ @@ -368,7 +368,7 @@ Copyright (C) 1976, 1977, 1978, 1979, 19
50
+ 1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
51
+ 2008 Free Software Foundation, Inc.
52
+ EOF
53
+ -rm $TMP*
54
+ +rm -f $TMP*
55
+
56
+ ## -------------- ##
57
+ ## Leading tabs. ##
58
+ @@ -397,7 +397,7 @@ compare - $TMP <<EOF || exit 1
59
+ Copyright (C) 1987-1988, 1991-2011 Free Software Foundation,
60
+ Inc.
61
+ EOF
62
+ -rm $TMP*
63
+ +rm -f $TMP*
64
+
65
+ ## -------------------- ##
66
+ ## Unusual whitespace. ##
67
+ @@ -427,7 +427,7 @@ compare - $TMP <<EOF || exit 1
68
+ # Copyright (C) 1987-1988, 1991-2011 Free Software
69
+ # Foundation, Inc.
70
+ EOF
71
+ -rm $TMP*
72
+ +rm -f $TMP*
73
+
74
+ ## --------- ##
75
+ ## DOS EOL. ##
76
+ @@ -449,7 +449,7 @@ Rem 1998, 1999, 2000, 2001, 2002, 2003,
77
+ Rem 2009, 2010 Free Software Foundation, Inc.@
78
+ EOF
79
+ compare $TMP-exp $TMP || exit 1
80
+ -rm $TMP*
81
+ +rm -f $TMP*
82
+
83
+ ## --------------- ##
84
+ ## Omitted "(C)". ##
85
+ @@ -470,7 +470,7 @@ compare - $TMP <<EOF || exit 1
86
+ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
87
+ Free Software Foundation, Inc.
88
+ EOF
89
+ -rm $TMP*
90
+ +rm -f $TMP*
91
+
92
+ ## ------------------ ##
93
+ ## C-style comments. ##
94
+ @@ -532,6 +532,6 @@ compare - $TMP.extra-text-space <<EOF ||
95
+ Inc. ***
96
+ * End of comments. */
97
+ EOF
98
+ -rm $TMP*
99
+ +rm -f $TMP*
100
+
101
+ exit 0
102
+ diff -up grep-2.9/gnulib-tests/test-version-etc.sh.orig grep-2.9/gnulib-tests/test-version-etc.sh
103
+ --- grep-2.9/gnulib-tests/test-version-etc.sh.orig 2011-01-03 21:57:35.000000000 +0100
104
+ +++ grep-2.9/gnulib-tests/test-version-etc.sh 2011-07-11 11:40:12.706055333 +0200
105
+ @@ -38,6 +38,6 @@ EOT
106
+ tr -d '\015' |
107
+ diff -c $TMP - || ERR=1
108
+
109
+ -rm $TMP
110
+ +rm -f $TMP
111
+
112
+ exit $ERR
file modified
+7 -1
grep.spec CHANGED
@@ -3,13 +3,14 @@
3
3
Summary: Pattern matching utilities
4
4
Name: grep
5
5
Version: 2.9
6
- Release: 2%{?dist}
6
+ Release: 3%{?dist}
7
7
License: GPLv3+
8
8
Group: Applications/Text
9
9
Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
10
10
Source1: colorgrep.sh
11
11
Source2: colorgrep.csh
12
12
Source3: GREP_COLORS
13
+ Patch1: grep-2.9-gnulib-tests-rm-f.patch
13
14
URL: http://www.gnu.org/software/grep/
14
15
Requires(post): /sbin/install-info
15
16
Requires(preun): /sbin/install-info
@@ -26,6 +27,7 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
26
27
27
28
%prep
28
29
%setup -q
30
+ %patch1 -p1 -b .gnulib-tests-rm-f
29
31
30
32
%build
31
33
%global BUILD_FLAGS $RPM_OPT_FLAGS
@@ -77,6 +79,10 @@ fi
77
79
%{_mandir}/*/*
78
80
79
81
%changelog
82
+ * Mon Jul 11 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 2.9-3
83
+ - Use rm -f in gnulib-tests (gnulib-tests-rm-f patch)
84
+ Resolves: rhbz#716330
85
+
80
86
* Mon Jul 04 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 2.9-2
81
87
- Fixed build failure on ppc - long double forced to double on ppc
82
88