update software to version 3.4

Signed-off-by: JeanLeo <liujianliu.liu@huawei.com>

GREP_COLORS

@@ -1,4 +0,0 @@
-# Configuration file for the color grep utility
-
-# 'none' shuts colorization off.
-#COLOR none

colorgrep.csh

@@ -1,11 +0,0 @@
-
-# color-grep initialization
-
-/usr/libexec/grepconf.sh -c
-if ( $status == 1 ) then
-    exit
-endif
-
-alias grep 'grep --color=auto'
-alias egrep 'egrep --color=auto'
-alias fgrep 'fgrep --color=auto'

colorgrep.sh

@@ -1,7 +0,0 @@
-# color-grep initialization
-
-/usr/libexec/grepconf.sh -c || return
-
-alias grep='grep --color=auto' 2>/dev/null
-alias egrep='egrep --color=auto' 2>/dev/null
-alias fgrep='fgrep --color=auto' 2>/dev/null

grep-3.1-glibc-2.28-fix.patch

@@ -1,38 +0,0 @@
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 66fb461..c6e96e4 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -55,10 +55,6 @@ XFAIL_TESTS = triple-backref
- # FIXME-2015: Remove this once the gnulib bug is fixed.
- if USE_INCLUDED_REGEX
- XFAIL_TESTS += equiv-classes
--else
--# The backslash-alt test fails for glibc, which needs to be fixed.
--# FIXME-2015: Remove this once the glibc bug is fixed.
--XFAIL_TESTS += backref-alt
- endif
- 
- TESTS =						\
-diff --git a/tests/Makefile.in b/tests/Makefile.in
-index 55c72d0..04e64af 100644
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -108,9 +108,6 @@ check_PROGRAMS = get-mb-cur-max$(EXEEXT)
- # The included matcher needs to be fixed.
- # FIXME-2015: Remove this once the gnulib bug is fixed.
- @USE_INCLUDED_REGEX_TRUE@am__append_1 = equiv-classes
--# The backslash-alt test fails for glibc, which needs to be fixed.
--# FIXME-2015: Remove this once the glibc bug is fixed.
--@USE_INCLUDED_REGEX_FALSE@am__append_2 = backref-alt
- subdir = tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1408,7 +1405,7 @@ LDADD = ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a
- # matcher (i.e., with glibc) and with the included matcher.
- # Both matchers need to be fixed.
- # FIXME-2015: Remove this once the glibc and gnulib bugs are fixed.
--XFAIL_TESTS = triple-backref $(am__append_1) $(am__append_2)
-+XFAIL_TESTS = triple-backref $(am__append_1)
- TESTS = \
-   backref					\
-   backref-alt					\

grep-3.31-help-align.patch

@@ -1,30 +0,0 @@
-diff --git a/src/grep.c b/src/grep.c
-index a2de03d..fd1b3a9 100644
---- a/src/grep.c
-+++ b/src/grep.c
-@@ -1962,17 +1962,20 @@ 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\
-+      --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 with no selected lines\n\
-+  -L, --files-without-match print only names of FILEs with no selected lines\n\
-   -l, --files-with-matches  print only names of FILEs with selected lines\n\
-   -c, --count               print only a count of selected lines per FILE\n\
-   -T, --initial-tab         make tabs line up (if needed)\n\

grep-3.31-man-fix-gs.patch

@@ -1,61 +0,0 @@
-diff --git a/doc/grep.in.1 b/doc/grep.in.1
-index 40c9586..a4e89eb 100644
---- a/doc/grep.in.1
-+++ b/doc/grep.in.1
-@@ -335,7 +335,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
-@@ -348,7 +348,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
-@@ -361,13 +361,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/grep.c b/src/grep.c
-index 8d22aec..a2de03d 100644
---- a/src/grep.c
-+++ b/src/grep.c
-@@ -1986,6 +1986,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\

grep.spec

@@ -1,18 +1,10 @@
-Name: grep
+Name:    grep
-Version: 3.1
+Version: 3.4
-Release: 10
+Release: 0
 Summary: A string search utility
 License: GPLv3+
 URL: http://www.gnu.org/software/grep/
 Source0: https://ftp.gnu.org/gnu/grep/grep-%{version}.tar.xz
-Source1: colorgrep.sh
-Source2: colorgrep.csh
-Source3: GREP_COLORS
-Source4: grepconf.sh
-
-Patch0: grep-3.31-man-fix-gs.patch
-Patch1: grep-3.31-help-align.patch
-Patch2: grep-3.1-glibc-2.28-fix.patch
 
 BuildRequires: gcc git pcre-devel >= 3.9-10 texinfo gettext
 Provides: /bin/egrep /bin/fgrep /bin/grep bundled(gnulib)
@@ -33,9 +25,6 @@ CPPFLAGS="-I%{_includedir}/pcre" CFLAGS="$RPM_OPT_FLAGS"
 %make_install
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -pm 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
-install -Dpm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/grepconf.sh
 
 %pre
 %preun
@@ -50,14 +39,17 @@ make check
 %doc NEWS README THANKS TODO
 %license COPYING AUTHORS
 %{_bindir}/*grep
-%config(noreplace) %{_sysconfdir}/profile.d/colorgrep.*sh
-%config(noreplace) %{_sysconfdir}/GREP_COLORS
 %{_infodir}/grep.info.gz
 %{_mandir}/man1/*grep.1.gz
-%{_libexecdir}/grepconf.sh
 
 
 %changelog
+* Tue Jan  7 2020 JeanLeo<liujianliu.liu@huawei.com> - 3.4-0
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:update software to version 3.4
+
 * Mon Oct 21 2019 chengquan<chengquan3@huawei.com> - 3.1-10
 - Type:bugfix
 - ID:NA

grepconf.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-    -c | --interactive-color)
-        ! grep -qsi "^COLOR.*none" /etc/GREP_COLORS
-        ;;
-    *)
-        echo >&2 "Invalid / no option passed, so far only -c | --interactive-color is supported."
-        exit 1
-        ;;
-esac