diff --git a/grep-i18n-speedup.diff b/grep-i18n-speedup.diff index a45410f..ce555b5 100644 --- a/grep-i18n-speedup.diff +++ b/grep-i18n-speedup.diff @@ -18,12 +18,11 @@ { if (iswupper((wint_t)wc)) { -@@ -327,9 +327,9 @@ EXECUTE_FCT(EGexecute) +@@ -327,9 +327,8 @@ EXECUTE_FCT(EGexecute) if (start_ptr) start_ptr = case_buf + (start_ptr - buf); buf = case_buf; -+ if (kwset) -+ mb_properties = check_multibyte_string(buf, size, 1); ++ mb_properties = check_multibyte_string(buf, size, 1); } - if (kwset) - mb_properties = check_multibyte_string(buf, size); diff --git a/grep.changes b/grep.changes index 08103df..f7eaf96 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 11 17:45:07 CET 2008 - schwab@suse.de + +- Fix another icase bug. + ------------------------------------------------------------------- Wed Nov 28 14:27:50 CET 2007 - schwab@suse.de diff --git a/grep.spec b/grep.spec index bbdcde5..97593b4 100644 --- a/grep.spec +++ b/grep.spec @@ -1,7 +1,7 @@ # # spec file for package grep (Version 2.5.2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,6 +10,7 @@ # norootforbuild + Name: grep BuildRequires: pcre-devel Url: http://www.gnu.org/software/grep/ @@ -19,7 +20,7 @@ Provides: base:/usr/bin/grep AutoReqProv: on PreReq: %{install_info_prereq} Version: 2.5.2 -Release: 37 +Release: 50 Summary: Print lines matching a pattern Source: grep-%{version}.tar.bz2 Patch: grep-%{version}.diff @@ -94,84 +95,86 @@ ln -sf ../../bin/grep $RPM_BUILD_ROOT/usr/bin/grep %doc %{_infodir}/*.gz %changelog -* Wed Nov 28 2007 - schwab@suse.de +* Mon Feb 11 2008 schwab@suse.de +- Fix another icase bug. +* Wed Nov 28 2007 schwab@suse.de - General cleanup. -* Wed Sep 12 2007 - schwab@suse.de +* Wed Sep 12 2007 schwab@suse.de - Allocate MB properties lazily. -* Tue May 15 2007 - schwab@suse.de +* Tue May 15 2007 schwab@suse.de - Fix some icase bugs. -* Mon May 07 2007 - schwab@suse.de +* Mon May 07 2007 schwab@suse.de - Try to get something sensible out of CVS. -* Thu Mar 22 2007 - schwab@suse.de +* Thu Mar 22 2007 schwab@suse.de - Add a variant of the mbcache patch. -* Mon Jul 17 2006 - schwab@suse.de +* Mon Jul 17 2006 schwab@suse.de - Fix matching in unsafe encodings [#192390]. -* Sun Jun 11 2006 - schwab@suse.de +* Sun Jun 11 2006 schwab@suse.de - Fix crash with -P '\xa'. -* Wed Mar 15 2006 - schwab@suse.de +* Wed Mar 15 2006 schwab@suse.de - Don't block on opening a pipe when devices are supposed to be skipped [#149660]. -* Wed Feb 08 2006 - schwab@suse.de +* Wed Feb 08 2006 schwab@suse.de - Fix dfa generation of interval expressions [#148453]. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jan 20 2006 - agruen@suse.de +* Fri Jan 20 2006 agruen@suse.de - Fix a formatting error in the man page. -* Sat Mar 12 2005 - schwab@suse.de +* Sat Mar 12 2005 schwab@suse.de - Fix word matching. -* Mon Nov 22 2004 - schwab@suse.de +* Mon Nov 22 2004 schwab@suse.de - Update to grep 2.5.1a. -* Wed Oct 20 2004 - ro@suse.de +* Wed Oct 20 2004 ro@suse.de - locale rename: no -> nb -* Thu Sep 23 2004 - schwab@suse.de +* Thu Sep 23 2004 schwab@suse.de - Better fix for last change [#45689]. -* Wed Mar 17 2004 - schwab@suse.de +* Wed Mar 17 2004 schwab@suse.de - Fix dangling pointer [#36172]. -* Wed Mar 03 2004 - schwab@suse.de +* Wed Mar 03 2004 schwab@suse.de - Update from CVS. -* Thu Feb 19 2004 - kukuk@suse.de +* Thu Feb 19 2004 kukuk@suse.de - Cleanup neededforbuild -* Tue Feb 10 2004 - schwab@suse.de +* Tue Feb 10 2004 schwab@suse.de - Fix configure test for strerror [#34231]. -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - add %%defattr - let rpm strip -* Fri Jul 25 2003 - schwab@suse.de +* Fri Jul 25 2003 schwab@suse.de - Fix parsing of bracket expressions. -* Mon Jul 21 2003 - schwab@suse.de +* Mon Jul 21 2003 schwab@suse.de - Fix use of pointer after free. -* Fri Jun 20 2003 - ro@suse.de +* Fri Jun 20 2003 ro@suse.de - build with current gettext -* Wed Apr 30 2003 - schwab@suse.de +* Wed Apr 30 2003 schwab@suse.de - Add i18n speedup patch from Takashi. -* Thu Apr 24 2003 - ro@suse.de +* Thu Apr 24 2003 ro@suse.de - fix install_info --delete call and move from preun to postun -* Mon Apr 07 2003 - schwab@suse.de +* Mon Apr 07 2003 schwab@suse.de - Only delete info entries when removing last version. -* Wed Feb 12 2003 - schwab@suse.de +* Wed Feb 12 2003 schwab@suse.de - Disable huge backref test for now. -* Thu Feb 06 2003 - schwab@suse.de +* Thu Feb 06 2003 schwab@suse.de - Use %%install_info. -* Mon Nov 18 2002 - schwab@suse.de +* Mon Nov 18 2002 schwab@suse.de - Add AM_GNU_GETTEXT_VERSION. -* Thu Aug 15 2002 - schwab@suse.de +* Thu Aug 15 2002 schwab@suse.de - Add i18n patches. -* Wed Apr 03 2002 - schwab@suse.de +* Wed Apr 03 2002 schwab@suse.de - Link -lpcre statically. -* Wed Apr 03 2002 - schwab@suse.de +* Wed Apr 03 2002 schwab@suse.de - Update to grep 2.5.1. * Includes support for Perl regexps. -* Wed Apr 03 2002 - ro@suse.de +* Wed Apr 03 2002 ro@suse.de - build with current autoconf/automake -* Tue Feb 05 2002 - schwab@suse.de +* Tue Feb 05 2002 schwab@suse.de - Don't replace autoconf macros from gettext. -* Mon Jan 28 2002 - schwab@suse.de +* Mon Jan 28 2002 schwab@suse.de - Add i18n patch. -* Tue Sep 04 2001 - schwab@suse.de +* Tue Sep 04 2001 schwab@suse.de - Update to grep 2.4.2: - New option --binary-files - Final newline silently provided. -* Thu Mar 22 2001 - ro@suse.de +* Thu Mar 22 2001 ro@suse.de - added split-aliases as provides -* Wed Mar 07 2001 - schwab@suse.de +* Wed Mar 07 2001 schwab@suse.de - Split from base.