[grep] New version

Jaroslav Škarvada jskarvad at fedoraproject.org
Fri Mar 2 15:17:00 UTC 2012


commit a2e8226e4cd6fd471e2177886efcfbf887a526e9
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Mar 2 16:16:57 2012 +0100

    New version

 .gitignore                                         |    2 +-
 ...rm-f.patch => grep-2.11-gnulib-tests-rm-f.patch |    6 +++---
 grep.spec                                          |    9 ++++++---
 sources                                            |    2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b61ff61..7da629a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-grep-2.10.tar.xz
+grep-*.tar.xz
diff --git a/grep-2.9-gnulib-tests-rm-f.patch b/grep-2.11-gnulib-tests-rm-f.patch
similarity index 95%
rename from grep-2.9-gnulib-tests-rm-f.patch
rename to grep-2.11-gnulib-tests-rm-f.patch
index e594b82..9754013 100644
--- a/grep-2.9-gnulib-tests-rm-f.patch
+++ b/grep-2.11-gnulib-tests-rm-f.patch
@@ -64,9 +64,9 @@ diff -up grep-2.9/gnulib-tests/test-update-copyright.sh.orig grep-2.9/gnulib-tes
  
  ## -------------------- ##
  ## Unusual whitespace.  ##
-@@ -427,7 +427,7 @@ compare - $TMP <<EOF || exit 1
- 		# Copyright (C) 1987-1988, 1991-2011 Free Software
- 		# Foundation, Inc.
+@@ -434,7 +434,7 @@ compare - $TMP <<EOF || exit 1
+ compare - $TMP <<EOF || exit 1
+ 		# Copyright (C) 1987-2011 Free Software Foundation, Inc.
  EOF
 -rm $TMP*
 +rm -f $TMP*
diff --git a/grep.spec b/grep.spec
index 1f99c67..672b611 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,15 +2,15 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.10
-Release: 3%{?dist}
+Version: 2.11
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
 Source1: colorgrep.sh
 Source2: colorgrep.csh
 Source3: GREP_COLORS
-Patch1: grep-2.9-gnulib-tests-rm-f.patch
+Patch1: grep-2.11-gnulib-tests-rm-f.patch
 URL: http://www.gnu.org/software/grep/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -79,6 +79,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Fri Mar  2 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 2.11-1
+- New version
+
 * Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 2.10-3
 - Rebuild against PCRE 8.30
 
diff --git a/sources b/sources
index da083a6..82f7ceb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-709915434d09f5db655e5ebd7fd6bb7f  grep-2.10.tar.xz
+ad9c6dbdeab93e50d2bc380f10ed3643  grep-2.11.tar.xz


More information about the scm-commits mailing list