rpms/grep/F-12 .cvsignore, 1.8, 1.9 grep.spec, 1.79, 1.80 sources, 1.8, 1.9 grep-2.6-sigsegv.patch, 1.1, NONE

[Jaroslav Škarvada]

Author: jskarvad

Update of /cvs/pkgs/rpms/grep/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4822

Modified Files:
	.cvsignore grep.spec sources 
Removed Files:
	grep-2.6-sigsegv.patch 
Log Message:
* Fri Mar 26 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 2.6.1-1
- New version: grep-2.6.1
- Dropped sigsegv patch (integrated upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grep/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Mar 2010 16:54:22 -0000	1.8
+++ .cvsignore	26 Mar 2010 06:43:12 -0000	1.9
@@ -1 +1 @@
-grep-2.6.tar.xz
+grep-2.6.1.tar.xz


Index: grep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grep/F-12/grep.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- grep.spec	23 Mar 2010 16:54:26 -0000	1.79
+++ grep.spec	26 Mar 2010 06:43:12 -0000	1.80
@@ -2,12 +2,11 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.6
+Version: 2.6.1
 Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
-Patch0: grep-2.6-sigsegv.patch
 URL: http://www.gnu.org/software/grep/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -24,7 +23,6 @@ GNU grep is needed by many scripts, so i
 
 %prep
 %setup -q
-%patch0 -p1 -b .sigsegv
 
 %build
 %configure --without-included-regex CPPFLAGS="-I%{_includedir}/pcre"
@@ -62,6 +60,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Fri Mar 26 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 2.6.1-1
+- New version: grep-2.6.1
+- Dropped sigsegv patch (integrated upstream)
+
 * Tue Mar 23 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 2.6-1
 - New version: grep-2.6
 - Added sigsegv patch (after release patch from upstream)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grep/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Mar 2010 16:54:26 -0000	1.8
+++ sources	26 Mar 2010 06:43:12 -0000	1.9
@@ -1 +1 @@
-a55bd2d80f7b76563f0f069c52aa730e  grep-2.6.tar.xz
+6462c218ad2df7e111206d06bef38363  grep-2.6.1.tar.xz


--- grep-2.6-sigsegv.patch DELETED ---