diff --git a/grep-2.12.tar.bz2 b/grep-2.12.tar.bz2 deleted file mode 100644 index 52e9b25..0000000 --- a/grep-2.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aba3fe978ff70831dee012a0960416d723b4f4c520338094f58d554b0f7dec5c -size 1566083 diff --git a/grep-2.13.tar.bz2 b/grep-2.13.tar.bz2 new file mode 100644 index 0000000..fd5b651 --- /dev/null +++ b/grep-2.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cc8c79d1dd3d068baa140db683140db34048d84024ad042e46e9953fec8d494 +size 1585890 diff --git a/grep.changes b/grep.changes index e5fdad3..17192f9 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Jul 5 11:27:21 CEST 2012 - jsmeix@suse.de + +- Update to 2.13: + It's moderately important to upgrade from grep-2.6 or newer, + since a Turkish I-with-dot (U+0130) on a matched/printed line + makes "grep -i" (in nearly any UTF-8 locale) emit corrupt output. + Bug fixes: + * grep -i, in a multi-byte locale, when matching a line + containing a character like the UTF-8 Turkish I-with-dot + (U+0130) (whose lower-case representation occupies fewer + bytes), would print an incomplete output line. Similarly, + with a matched line containing a character (e.g., the Latin + capital I in a Turkish UTF-8 locale), where the lower-case + representation occupies more bytes, grep could print garbage. + [bug introduced in grep-2.6] + * --include and --exclude can again be combined, and again + apply to the command line, e.g., "grep --include='*.[ch]' + --exclude='system.h' PATTERN *" again reads all *.c + and *.h files except for system.h. + [bug introduced in grep-2.6] + New features: + * 'grep' without -z now treats a sparse file as binary, + if it can easily determine that the file is sparse. + Dropped features: + * Bootstrapping with Makefile.boot has been broken since + grep 2.6, and was removed. + ------------------------------------------------------------------- Mon May 21 18:19:15 UTC 2012 - tabraham@novell.com diff --git a/grep.spec b/grep.spec index 5c58072..4299ded 100644 --- a/grep.spec +++ b/grep.spec @@ -25,12 +25,24 @@ BuildRequires: pcre Url: http://www.gnu.org/software/grep/ Provides: base:/usr/bin/grep PreReq: %{install_info_prereq} -Version: 2.12 +Version: 2.13 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0+ Group: Productivity/Text/Utilities -Source: grep-%{version}.tar.bz2 +# URL for Source0: http://ftp.gnu.org/gnu/grep/grep-2.13.tar.xz +# URL for the GPG signature for Source0: http://ftp.gnu.org/gnu/grep/grep-2.13.tar.xz.sig +# How to verify Source0: +# To import the required public key run: gpg --keyserver keys.gnupg.net --recv-keys 7FD9FCCB000BEEEE +# To verify Source0 run: gpg --verify grep-2.13.tar.xz.sig +# The result should look like: +# gpg: Good signature from "Jim Meyering " +# gpg: WARNING: This key is not certified with a trusted signature! +# In the openSUSE build service SLE_11_SP1 does not provide an "xz" package +# so that "BuildRequires: xz" cannot be used to make it work with Source0 as is. +# Therefore to decompress Source0 run: xz -d grep-2.13.tar.xz +# and then to compress it again run: bzip2 grep-2.13.tar +Source0: grep-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,7 +60,6 @@ echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre. %ifarch ppc ppc64 export CFLAGS="$RPM_OPT_FLAGS -mlong-double-64" %endif - %if 0%{?suse_version} < 1120 %configure -C --bindir=/bin --disable-silent-rules --without-included-regex %else