diff --git a/grep-2.13.tar.bz2 b/grep-2.13.tar.bz2 deleted file mode 100644 index fd5b651..0000000 --- a/grep-2.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cc8c79d1dd3d068baa140db683140db34048d84024ad042e46e9953fec8d494 -size 1585890 diff --git a/grep-2.14.de.po.bz2 b/grep-2.14.de.po.bz2 new file mode 100644 index 0000000..f478270 --- /dev/null +++ b/grep-2.14.de.po.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e1be17bf7fc892903325b3fcad3c13be765ca233fb8a3821dab2fdd50d2c81c +size 90970 diff --git a/grep-2.14.tar.bz2 b/grep-2.14.tar.bz2 new file mode 100644 index 0000000..831ec6e --- /dev/null +++ b/grep-2.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53f8d2ba2e61744da0b899c85b46bbc23e49b5babf83bff3e5ce9516456f8408 +size 1596007 diff --git a/grep.changes b/grep.changes index 17192f9..3ae5848 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Aug 24 20:29:59 CEST 2012 - pth@suse.de + +- Update to 2.14: + Bug fixes: + + * grep -i '^$' could exit 0 (i.e., report a match) in a multi-byte + locale, even though there was no match, and the command generated + no output. E.g., seq 2 | LC_ALL=en_US.utf8 grep -il '^$' would + mistakenly print "(standard input)". Related, seq 9 | + LC_ALL=en_US.utf8 grep -in '^$' would print "2:4:6:8:10:12:14:16" + and exit 0. Now it prints nothing and exits with status of 1. + [bug introduced in grep-2.6] + + * 'grep' no longer falsely reports text files as being binary on + file systems that compress contents or that store tiny contents + in metadata. + +- Add current German message catalog from the translation project. + ------------------------------------------------------------------- Thu Jul 5 11:27:21 CEST 2012 - jsmeix@suse.de diff --git a/grep.spec b/grep.spec index 4299ded..47ebdbe 100644 --- a/grep.spec +++ b/grep.spec @@ -25,33 +25,35 @@ BuildRequires: pcre Url: http://www.gnu.org/software/grep/ Provides: base:/usr/bin/grep PreReq: %{install_info_prereq} -Version: 2.13 +Version: 2.14 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0+ Group: Productivity/Text/Utilities -# 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 +# URL for Source0: http://ftp.gnu.org/gnu/grep/grep-2.14.tar.xz +# URL for the GPG signature for Source0: http://ftp.gnu.org/gnu/grep/grep-2.14.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 +# To verify Source0 run: gpg --verify grep-2.14.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 +# To convert from xz to bzip2 do: xz -cd grep-2.14.tar.xz | bzip2 -9c >grep-2.14.tar.bz2 Source0: grep-%{version}.tar.bz2 +# Up-to-date German messages for grep +Source1: grep-%{version}.de.po.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -The grep command searches one or more input files -for lines containing a match to a specified pattern. -By default, grep prints the matching lines. +The grep command searches one or more input files for lines +containing a match to a specified pattern. By default, grep prints +the matching lines. %prep %setup -q +bunzip2 -dc %{S:1} > po/de.po %if 0%{?suse_version} < 1120 echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache %endif @@ -72,18 +74,18 @@ AUTOPOINT=true autoreconf --force --install make check VERBOSE=1 %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall %if 0%{?suse_version} < 1120 -install -d $RPM_BUILD_ROOT/usr/bin -ln -sf ../../bin/egrep $RPM_BUILD_ROOT/usr/bin/egrep -ln -sf ../../bin/fgrep $RPM_BUILD_ROOT/usr/bin/fgrep -ln -sf ../../bin/grep $RPM_BUILD_ROOT/usr/bin/grep +install -d %{buildroot}/usr/bin +ln -sf ../../bin/egrep %{buildroot}%{_bindir}/egrep +ln -sf ../../bin/fgrep %{buildroot}%{_bindir}/fgrep +ln -sf ../../bin/grep %{buildroot}%{_bindir}/grep %else #UsrMerge -install -d $RPM_BUILD_ROOT/bin -ln -sf %{_bindir}/egrep $RPM_BUILD_ROOT/bin/egrep -ln -sf %{_bindir}/fgrep $RPM_BUILD_ROOT/bin/fgrep -ln -sf %{_bindir}/grep $RPM_BUILD_ROOT/bin/grep +install -d %{buildroot}/bin +ln -sf %{_bindir}/egrep %{buildroot}/bin/egrep +ln -sf %{_bindir}/fgrep %{buildroot}/bin/fgrep +ln -sf %{_bindir}/grep %{buildroot}/bin/grep #EndUsrMerge %endif %find_lang %name