diff --git a/grep-2.14.de.po.bz2 b/grep-2.14.de.po.bz2 deleted file mode 100644 index f478270..0000000 --- a/grep-2.14.de.po.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e1be17bf7fc892903325b3fcad3c13be765ca233fb8a3821dab2fdd50d2c81c -size 90970 diff --git a/grep-2.14.tar.xz b/grep-2.14.tar.xz deleted file mode 100644 index 288339c..0000000 --- a/grep-2.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e70e801d4fbb16e761654a58ae48bf5020621c95c8e35bd864742577685872e1 -size 1195640 diff --git a/grep-2.15.tar.xz b/grep-2.15.tar.xz new file mode 100644 index 0000000..06fac56 --- /dev/null +++ b/grep-2.15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf5a834e587974c8c64e71b35b9e75cd21c7ff253c0e7fbfb0a78be794965314 +size 1267312 diff --git a/grep-2.15.tar.xz.sig b/grep-2.15.tar.xz.sig new file mode 100644 index 0000000..81c7c97 --- /dev/null +++ b/grep-2.15.tar.xz.sig @@ -0,0 +1,19 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQJ8BAABCgBmBQJSa/ifXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNTVEM0ZDNTAwQzgzNDQ4NkQxRUVBNjc3 +RkQ5RkNDQjAwMEJFRUVFAAoJEH/Z/MsAC+7uxAkP/0XP/7YlCL1YdpUMsCzmiZqT +hZ5yG5cqqCsr5ESRvfRJ7HhVRGHfDX/3YXfqG8inNCtREKFqMgBxfitqJxHux+sd +jhDAg8qThHu4t4FIgC84kDjokd4OXtBZWLXs10ycEJOVftMVexPEDbi0A9GBiQ8G +JYp/bhjieALDCx1PCO3O6G8cAGgfaEk9sPq0W8bQPGPjtl2jXZKZKL8hRChtqS2A +wT0V4Q547ZI5DZJm3fcZclblwnHWXY2TJh9Ne3z0m4uy7GHz1gvQMKmMAsE+Wct1 +GJPfSjqsmy62cLj0W7pgLFOL5jPZdI6sHGokdvEsEbPQkjqG9yLUeHmsinLjsoVP +c+mfhXnT/IY5PAleMrvteipOLP/SS8G6MyI28Vri4BA/XVSyVzJZ4M6QKIiicKF3 +60lgMwPJWgR3fpgW367eAQwcNsvSD66dOyDMgI/iqLjP+LaoYK09IXGt4ZWJ9QJp +Q88M0tCB6esqxjV9kdt+zgrzpbwJEqLOcB8B8N8dXMLAyb6HiJuN2mgD6hR9D23O +3oiEjKWpRzQRfIXK49YOW+EVjyLGRLlU7SMwgZseJPu+YQZZ2RwHq+Yj831BbJ4u +yRQNC5pZdcaYyv56xZJR2TQK8R/w9HeohmzqCVMHOa4HZv3pVPE7yPdkx0hK1vJ/ +tuu9AXHedPKOyGaP/wjJ +=1fjx +-----END PGP SIGNATURE----- diff --git a/grep.changes b/grep.changes index bed85a4..7bd04fe 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed Dec 11 20:36:13 UTC 2013 - andreas.stieger@gmx.de + +- Update to 2.15: + Bug fixes: + * grep's \s and \S failed to work with multi-byte white space + characters. + * grep -i would segfault on systems using UTF-16-based wchar_t + when converting an input string containing certain 4-byte UTF-8 + sequences to lower case. + * grep -E would segfault when given a regexp like + '([^.]*[M]){1,2}' for any multibyte character M. + * grep -F would get stuck in an infinite loop when given a search + string that is an invalid byte sequence in the current locale + and that matches the bytes of the input twice on a line. Now + grep fails with exit status 1. + * grep -P could misbehave. + + New features: + * grep -P can now use a just-in-time compiler to greatly speed up + matches, This feature is transparent to the user; no flag is + required to enable it. It is only available if the + corresponding support in the PCRE library is detected when grep + is compiled. +- require xz for SLE +- require texinfo for makeinfo +- don't autoreconf +- remove the added german translations, upstream is up-to-date + ------------------------------------------------------------------- Wed Mar 27 12:55:18 UTC 2013 - mmeister@suse.com diff --git a/grep.keyring b/grep.keyring new file mode 100644 index 0000000..fc3c5f8 Binary files /dev/null and b/grep.keyring differ diff --git a/grep.spec b/grep.spec index 5b1ec22..3da8f85 100644 --- a/grep.spec +++ b/grep.spec @@ -17,33 +17,23 @@ Name: grep -BuildRequires: automake BuildRequires: pcre-devel +BuildRequires: texinfo +BuildRequires: xz %if 0%{?suse_version} < 1120 BuildRequires: pcre %endif Url: http://www.gnu.org/software/grep/ Provides: base:/usr/bin/grep PreReq: %{install_info_prereq} -Version: 2.14 +Version: 2.15 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.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.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. -# To convert from xz to bzip2 do: xz -cd grep-2.14.tar.xz | bzip2 -9c >grep-2.14.tar.bz2 Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz -# Up-to-date German messages for grep -Source1: grep-%{version}.de.po.bz2 +Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig +Source3: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=grep&download=1#/%{name}.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,7 +43,6 @@ 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 @@ -63,9 +52,10 @@ echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre. export CFLAGS="$RPM_OPT_FLAGS -mlong-double-64" %endif %if 0%{?suse_version} < 1120 -%configure -C --bindir=/bin --disable-silent-rules --without-included-regex +%configure -C --bindir=/bin --disable-silent-rules +%else if 0%{?suse_version} < 1310 +%configure --disable-silent-rules %else -AUTOPOINT=true autoreconf --force --install %configure --disable-silent-rules --without-included-regex %endif %{__make} %{?_smp_mflags} @@ -98,7 +88,7 @@ ln -sf %{_bindir}/grep %{buildroot}/bin/grep %files -f %name.lang %defattr(-,root,root) -%doc README AUTHORS NEWS THANKS TODO +%doc README AUTHORS NEWS THANKS TODO COPYING ChangeLog* %if 0%{?suse_version} < 1120 /bin/* %else