From 1fd6c0c375970c6071c2046256ef3671b3999e2a220cc72857f816d885273084 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 23 Sep 2010 14:42:19 +0000 Subject: [PATCH] Accepting request 48968 from home:jsmeix:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/48968 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=7 --- grep-2.6.3.tar.bz2 | 3 --- grep-2.7.tar.bz2 | 3 +++ grep.changes | 21 +++++++++++++++++++++ grep.spec | 30 +++++++++++++++--------------- 4 files changed, 39 insertions(+), 18 deletions(-) delete mode 100644 grep-2.6.3.tar.bz2 create mode 100644 grep-2.7.tar.bz2 diff --git a/grep-2.6.3.tar.bz2 b/grep-2.6.3.tar.bz2 deleted file mode 100644 index 5156de7..0000000 --- a/grep-2.6.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d319e79d5b1b3f9331da1db281949f7bc02e385abbf984764f2bb26783005c78 -size 1021770 diff --git a/grep-2.7.tar.bz2 b/grep-2.7.tar.bz2 new file mode 100644 index 0000000..d21dbf9 --- /dev/null +++ b/grep-2.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25061240265afa4ccf9383d11ddb5d3ccff12a2810f227286f7e566d506f239e +size 1166732 diff --git a/grep.changes b/grep.changes index cc4dc32..847cf76 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Sep 23 12:47:04 CEST 2010 - jsmeix@suse.de + +- Version upgrade to grep-2.7 with new behavior: + grep now diagnoses (and fails with exit status 2) commonly + mistyped regular expression like [:space:], [:digit:], etc. + Before, those were silently interpreted as [ac:eps] + and [dgit:] respectively. This new behavior is disabled + when the POSIXLY_CORRECT environment variable is set. + Regular expressions including back references are now + significantly faster in multi-byte locales. + Regular expressions including "." can now be significantly + faster in UTF-8 locales (though not in other multi-byte locales). + Several other minor bugs were fixed. + For details see the NEWS file. +- Adapted RPM description text to match the "Introduction to grep" + at http://www.gnu.org/software/grep/ and removed the outdated + Authors section, see the AUTHORS file for the right authors. +- Enhanced RPM spec file so that it builds and can be provided + even for older openSUSE and SLES versions. + ------------------------------------------------------------------- Thu Jul 22 15:45:31 CEST 2010 - jsmeix@suse.de diff --git a/grep.spec b/grep.spec index 043d1a6..9e376be 100644 --- a/grep.spec +++ b/grep.spec @@ -1,5 +1,5 @@ # -# spec file for package grep (Version 2.6.3) +# spec file for package grep (Version 2.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,39 +19,39 @@ Name: grep BuildRequires: pcre-devel +%if 0%{?suse_version} < 1120 +BuildRequires: pcre +%endif Url: http://www.gnu.org/software/grep/ License: GPLv3 Group: Productivity/Text/Utilities Provides: base:/usr/bin/grep AutoReqProv: on PreReq: %{install_info_prereq} -Version: 2.6.3 +Version: 2.7 Release: 1 Summary: Print lines matching a pattern Source: grep-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -GNU grep, the "fastest grep in the west" (hopefully). - -`grep' searches for lines matching a pattern. - - - -Authors: --------- - Alain Magloire - Aharon Robbins - David J MacKenzie - Karl Berry - Ulrich Drepper +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 +%if 0%{?suse_version} < 1120 +echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache +%endif %build +%if 0%{?suse_version} < 1120 +%configure -C --bindir=/bin --without-included-rege +%else AUTOPOINT=true autoreconf --force --install %configure --bindir=/bin --without-included-regex +%endif %{__make} %{?_smp_mflags} %check