diff --git a/grep-2.17-help-align.patch b/grep-2.17-help-align.patch
deleted file mode 100644
index ae0b26b..0000000
--- a/grep-2.17-help-align.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/main.c b/src/main.c
-index cc4ace3..e20d36c 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -1596,16 +1596,19 @@ Output control:\n\
- -D, --devices=ACTION how to handle devices, FIFOs and sockets;\n\
- ACTION is 'read' or 'skip'\n\
- -r, --recursive like --directories=recurse\n\
-- -R, --dereference-recursive likewise, but follow all symlinks\n\
-+ -R, --dereference-recursive\n\
-+ likewise, but follow all symlinks\n\
- "));
- printf (_("\
-- --include=FILE_PATTERN search only files that match FILE_PATTERN\n\
-- --exclude=FILE_PATTERN skip files and directories matching FILE_PATTERN\n\
-+ --include=FILE_PATTERN\n\
-+ search only files that match FILE_PATTERN\n\
-+ --exclude=FILE_PATTERN\n\
-+ skip files and directories matching FILE_PATTERN\n\
- --exclude-from=FILE skip files matching any file pattern from FILE\n\
-- --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n\
-+ --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n\
- "));
- printf (_("\
-- -L, --files-without-match print only names of FILEs containing no match\n\
-+ -L, --files-without-match print only names of FILEs containing no match\n\
- -l, --files-with-matches print only names of FILEs containing matches\n\
- -c, --count print only a count of matching lines per FILE\n\
- -T, --initial-tab make tabs line up (if needed)\n\
diff --git a/grep-2.17-man-fix-gs.patch b/grep-2.17-man-fix-gs.patch
deleted file mode 100644
index 2fc9a44..0000000
--- a/grep-2.17-man-fix-gs.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/doc/grep.in.1 b/doc/grep.in.1
-index 58a6c0e..3e6a8cf 100644
---- a/doc/grep.in.1
-+++ b/doc/grep.in.1
-@@ -377,7 +377,7 @@ Print
- .I NUM
- lines of trailing context after matching lines.
- Places a line containing a group separator
--.RB ( \-\^\- )
-+.RB "(described under " \-\^\-group\-separator )
- between contiguous groups of matches.
- With the
- .B \-o
-@@ -390,7 +390,7 @@ Print
- .I NUM
- lines of leading context before matching lines.
- Places a line containing a group separator
--.RB ( \-\^\- )
-+.RB "(described under " \-\^\-group\-separator )
- between contiguous groups of matches.
- With the
- .B \-o
-@@ -403,13 +403,24 @@ Print
- .I NUM
- lines of output context.
- Places a line containing a group separator
--.RB ( \-\^\- )
-+.RB "(described under " \-\^\-group\-separator )
- between contiguous groups of matches.
- With the
- .B \-o
- or
- .B \-\^\-only\-matching
- option, this has no effect and a warning is given.
-+.TP
-+.BI \-\^\-group\-separator= SEP
-+Use
-+.I SEP
-+as a group separator. By default
-+.I SEP
-+is double hyphen
-+.RB ( \-\^\- ).
-+.TP
-+.B \-\^\-no\-group-separator
-+Use empty string as a group separator.
- .SS "File and Directory Selection"
- .TP
- .BR \-a ", " \-\^\-text
-diff --git a/src/main.c b/src/main.c
-index bd20297..cc4ace3 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -1619,6 +1619,8 @@ Context control:\n\
- "));
- printf (_("\
- -NUM same as --context=NUM\n\
-+ --group-separator=SEP use SEP as a group separator\n\
-+ --no-group-separator use empty string as a group separator\n\
- --color[=WHEN],\n\
- --colour[=WHEN] use markers to highlight the matching strings;\n\
- WHEN is 'always', 'never', or 'auto'\n\
diff --git a/grep-2.18-help-align.patch b/grep-2.18-help-align.patch
new file mode 100644
index 0000000..ea151ec
--- /dev/null
+++ b/grep-2.18-help-align.patch
@@ -0,0 +1,29 @@
+diff --git a/src/main.c b/src/main.c
+index 9c0eaf2..07e001c 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -1597,16 +1597,19 @@ Output control:\n\
+ -D, --devices=ACTION how to handle devices, FIFOs and sockets;\n\
+ ACTION is 'read' or 'skip'\n\
+ -r, --recursive like --directories=recurse\n\
+- -R, --dereference-recursive likewise, but follow all symlinks\n\
++ -R, --dereference-recursive\n\
++ likewise, but follow all symlinks\n\
+ "));
+ printf (_("\
+- --include=FILE_PATTERN search only files that match FILE_PATTERN\n\
+- --exclude=FILE_PATTERN skip files and directories matching FILE_PATTERN\n\
++ --include=FILE_PATTERN\n\
++ search only files that match FILE_PATTERN\n\
++ --exclude=FILE_PATTERN\n\
++ skip files and directories matching FILE_PATTERN\n\
+ --exclude-from=FILE skip files matching any file pattern from FILE\n\
+- --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n\
++ --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n\
+ "));
+ printf (_("\
+- -L, --files-without-match print only names of FILEs containing no match\n\
++ -L, --files-without-match print only names of FILEs containing no match\n\
+ -l, --files-with-matches print only names of FILEs containing matches\n\
+ -c, --count print only a count of matching lines per FILE\n\
+ -T, --initial-tab make tabs line up (if needed)\n\
diff --git a/grep-2.18-man-fix-gs.patch b/grep-2.18-man-fix-gs.patch
new file mode 100644
index 0000000..757abf2
--- /dev/null
+++ b/grep-2.18-man-fix-gs.patch
@@ -0,0 +1,61 @@
+diff --git a/doc/grep.in.1 b/doc/grep.in.1
+index 58a6c0e..3e6a8cf 100644
+--- a/doc/grep.in.1
++++ b/doc/grep.in.1
+@@ -377,7 +377,7 @@ Print
+ .I NUM
+ lines of trailing context after matching lines.
+ Places a line containing a group separator
+-.RB ( \-\^\- )
++.RB "(described under " \-\^\-group\-separator )
+ between contiguous groups of matches.
+ With the
+ .B \-o
+@@ -390,7 +390,7 @@ Print
+ .I NUM
+ lines of leading context before matching lines.
+ Places a line containing a group separator
+-.RB ( \-\^\- )
++.RB "(described under " \-\^\-group\-separator )
+ between contiguous groups of matches.
+ With the
+ .B \-o
+@@ -403,13 +403,24 @@ Print
+ .I NUM
+ lines of output context.
+ Places a line containing a group separator
+-.RB ( \-\^\- )
++.RB "(described under " \-\^\-group\-separator )
+ between contiguous groups of matches.
+ With the
+ .B \-o
+ or
+ .B \-\^\-only\-matching
+ option, this has no effect and a warning is given.
++.TP
++.BI \-\^\-group\-separator= SEP
++Use
++.I SEP
++as a group separator. By default
++.I SEP
++is double hyphen
++.RB ( \-\^\- ).
++.TP
++.B \-\^\-no\-group-separator
++Use empty string as a group separator.
+ .SS "File and Directory Selection"
+ .TP
+ .BR \-a ", " \-\^\-text
+diff --git a/src/main.c b/src/main.c
+index 56ec6b3..9c0eaf2 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -1620,6 +1620,8 @@ Context control:\n\
+ "));
+ printf (_("\
+ -NUM same as --context=NUM\n\
++ --group-separator=SEP use SEP as a group separator\n\
++ --no-group-separator use empty string as a group separator\n\
+ --color[=WHEN],\n\
+ --colour[=WHEN] use markers to highlight the matching strings;\n\
+ WHEN is 'always', 'never', or 'auto'\n\
diff --git a/grep.spec b/grep.spec
index 14f812b..b15f57f 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,7 +2,7 @@
Summary: Pattern matching utilities
Name: grep
-Version: 2.17
+Version: 2.18
Release: 1%{?dist}
License: GPLv3+
Group: Applications/Text
@@ -11,9 +11,9 @@ Source1: colorgrep.sh
Source2: colorgrep.csh
Source3: GREP_COLORS
# upstream ticket 39444
-Patch0: grep-2.17-man-fix-gs.patch
+Patch0: grep-2.18-man-fix-gs.patch
# upstream ticket 39445
-Patch1: grep-2.17-help-align.patch
+Patch1: grep-2.18-help-align.patch
URL: http://www.gnu.org/software/grep/
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -85,6 +85,11 @@ fi
%{_mandir}/*/*
%changelog
+* Wed Feb 26 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.18-1
+- New version
+ Resolves: rhbz#1070127
+- De-fuzzified patches
+
* Tue Feb 18 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.17-1
- New version
Resolves: rhbz#1066310
diff --git a/sources b/sources
index f454ee5..6bd31c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b1f0cbf1139e76171f790665b1b41cf grep-2.17.tar.xz
+7439f8266f50844b56cc3e2721606541 grep-2.18.tar.xz