rpms/grep/F-11 .cvsignore, 1.7, 1.8 grep.spec, 1.76, 1.77 sources, 1.7, 1.8 grep-2.5.1a-utf8.patch, 1.1, NONE grep-2.5.3-case.patch, 1.1, NONE grep-2.5.3-egf-speedup.patch, 1.1, NONE grep-2.5.3-fedora-tests.patch, 1.1, NONE grep-2.5.3-pcrewrap.patch, 1.1, NONE grep-bz460641.patch, 1.1, NONE

[Jaroslav Škarvada]

Author: jskarvad

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

Modified Files:
	.cvsignore grep.spec sources 
Removed Files:
	grep-2.5.1a-utf8.patch grep-2.5.3-case.patch 
	grep-2.5.3-egf-speedup.patch grep-2.5.3-fedora-tests.patch 
	grep-2.5.3-pcrewrap.patch grep-bz460641.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-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Nov 2008 18:34:09 -0000	1.7
+++ .cvsignore	31 Mar 2010 13:49:32 -0000	1.8
@@ -1 +1 @@
-grep-2.5.3.tar.bz2
+grep-2.6.1.tar.xz


Index: grep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grep/F-11/grep.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- grep.spec	25 Feb 2009 00:59:40 -0000	1.76
+++ grep.spec	31 Mar 2010 13:49:33 -0000	1.77
@@ -2,18 +2,11 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.5.3
-Release: 4%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
-Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2
-Patch0: grep-2.5.3-fedora-tests.patch
-Patch2: grep-2.5.3-pcrewrap.patch
-Patch3: grep-2.5.3-case.patch
-Patch4: grep-2.5.3-egf-speedup.patch
-# bug #460641 (a.k.a. 479152)
-Patch40: grep-bz460641.patch
-Patch5: grep-2.5.1a-utf8.patch
+Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
 URL: http://www.gnu.org/software/grep/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -22,23 +15,16 @@ BuildRequires: pcre-devel >= 3.9-10, tex
 BuildRequires: autoconf automake
 
 %description
-The GNU versions of commonly used grep utilities.  Grep searches through
+The GNU versions of commonly used grep utilities. Grep searches through
 textual input for lines which contain a match to a specified pattern and then
-prints the matching lines.  GNU's grep utilities include grep, egrep and fgrep.
+prints the matching lines. GNU's grep utilities include grep, egrep and fgrep.
 
 GNU grep is needed by many scripts, so it shall be installed on every system.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fedora-tests
-%patch2 -p1 -b .pcrewrap
-%patch3 -p1 -b .case
-%patch4 -p1 -b .egf-speedup
-%patch40 -p1 -b .bz460641
-%patch5 -p1 -b .utf8
 
 %build
-./autogen.sh
 %configure --without-included-regex CPPFLAGS="-I%{_includedir}/pcre"
 make %{?_smp_mflags}
 
@@ -74,6 +60,31 @@ 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)
+- Dropped obsoleted patches: fedora-tests, pcrewrap, case, egf-speedup,
+  bz460641, utf8, dfa-optional, w
+
+* Fri Mar 05 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 2.5.4-2
+- Added w patch to fix -w switch behaviour broken by dfa-optional patch
+
+* Wed Feb 10 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 2.5.4-1
+- New version: grep-2.5.4 (#502931)
+- Fixed typos in %description
+- Updated utf-8 patch
+- Added dfa-optional patch (#538423)
+
+* Tue Aug 11 2009 Lubomir Rintel <lkundrak at v3.sk> 2.5.3-6
+- Silence possible scriptlets errors
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grep/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Nov 2008 18:34:10 -0000	1.7
+++ sources	31 Mar 2010 13:49:33 -0000	1.8
@@ -1 +1 @@
-27061ce1fde82876970b6549a156da8b  grep-2.5.3.tar.bz2
+6462c218ad2df7e111206d06bef38363  grep-2.6.1.tar.xz


--- grep-2.5.1a-utf8.patch DELETED ---


--- grep-2.5.3-case.patch DELETED ---


--- grep-2.5.3-egf-speedup.patch DELETED ---


--- grep-2.5.3-fedora-tests.patch DELETED ---


--- grep-2.5.3-pcrewrap.patch DELETED ---


--- grep-bz460641.patch DELETED ---