From 7d179c3ddc292c744a412d8f1a9c6930b83bef70591e8abe40269d012229128d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 19 Feb 2014 12:44:11 +0000 Subject: [PATCH] Accepting request 223015 from home:mvyskocil:branches:Base:System - update to 2.17 * grep -i in a multibyte locale is now typically 10 times faster for patterns that do not contain \ or [ * grep (without -i) in a multibyte locale is now up to 7 times faster when processing many matched lines * grep's --mmap option was disabled in March of 2010, and began to elicit a warning in January of 2012. Now it is completely gone. - Reformat spec file using hints from spec-cleaner OBS-URL: https://build.opensuse.org/request/show/223015 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=42 --- grep-2.16.tar.xz | 3 --- grep-2.16.tar.xz.sig | 19 ------------------- grep-2.17.tar.xz | 3 +++ grep-2.17.tar.xz.sig | 19 +++++++++++++++++++ grep.changes | 12 ++++++++++++ grep.spec | 38 ++++++++++++++++++++------------------ 6 files changed, 54 insertions(+), 40 deletions(-) delete mode 100644 grep-2.16.tar.xz delete mode 100644 grep-2.16.tar.xz.sig create mode 100644 grep-2.17.tar.xz create mode 100644 grep-2.17.tar.xz.sig diff --git a/grep-2.16.tar.xz b/grep-2.16.tar.xz deleted file mode 100644 index 77dc3ec..0000000 --- a/grep-2.16.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16dfeb5013d8c9f21f40ccec0936f2c1c6a014c828d30488f0d5c6ef7b551162 -size 1210192 diff --git a/grep-2.16.tar.xz.sig b/grep-2.16.tar.xz.sig deleted file mode 100644 index 7c4e2fa..0000000 --- a/grep-2.16.tar.xz.sig +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQJ8BAABCgBmBQJSxO/+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNTVEM0ZDNTAwQzgzNDQ4NkQxRUVBNjc3 -RkQ5RkNDQjAwMEJFRUVFAAoJEH/Z/MsAC+7uyRcP+wdaaHZfFCRYs4HBDQjBQsvD -mqht6oMWCvGmaoLsvKVHWu3D6RkWj47zKARfIXBa5CG+lhrBWbYu5u8IhfPWLEZ+ -XzoJ3lazcndK6MQIbtQTQn2B7g71ZOSoLmq3CN/cUqbgUHPZVB4XYct2Gj33yzDB -Dpu+BzNtOnKWB/BvWyaKVvWyDb28hzJPmMbs+5Vj+XkkHFS3/e3Jr60wrkuz2rUH -5ld6LqjmDW8NF053oC54HxwOEkPSXfUomWHG574IQF6GagVx9oPdN9XzJEdq+W3w -w3ZciOESwcDvXqQN2BCpPEd7wjAHAUfmu2dVWIS5eyT4PiVxbxnvUQGomFwc9iec -MN3Tj7zLdmyc5tVNr0+R/9orY/TK+fU+UDCCY0jgZlJtD9LfDc3aPo86UaUkRiNx -TaDNdAkqlD13ENNftED4/2uY8HvKSMCVYoWm8/AluiapPC79OsOeKjf2S2B4He5v -OGhx8oyq0h7lWirIYtrgtLo3ba6YLy6iKA8wDfSkbj3Llaq/GxCyE9LA7J9mo5Ff -5W2XI7lkSYu0thdJeBkLlVAYMczExMk7jfQigO3mdghAWsbU7/ObpG7Dk4F8Mxid -zdN9A5bq656N9M0hX0G5SYI6yWzilVnRfeNSrg6B9OjOLYF32Xrbmfw6DiwhW9uJ -zxK7ZFdf7jfAfXaRx6Px -=Ynhf ------END PGP SIGNATURE----- diff --git a/grep-2.17.tar.xz b/grep-2.17.tar.xz new file mode 100644 index 0000000..e668966 --- /dev/null +++ b/grep-2.17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26fdb0220cd27699f82612352f52429b472f140cdc8315ad9eaa6d70e75a06e5 +size 1212488 diff --git a/grep-2.17.tar.xz.sig b/grep-2.17.tar.xz.sig new file mode 100644 index 0000000..66f65b7 --- /dev/null +++ b/grep-2.17.tar.xz.sig @@ -0,0 +1,19 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQJ8BAABCgBmBQJTAtc5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNTVEM0ZDNTAwQzgzNDQ4NkQxRUVBNjc3 +RkQ5RkNDQjAwMEJFRUVFAAoJEH/Z/MsAC+7uwJYQAJ+0ZPGPSSyGPx5pdsZp6bLR +vsGR33Bor5May3ZiuXRGGeIehWobOQz5GLSToO2ktQ4GndwEXzBUS8T78wlfXxPo +1yFhPEvCtQzYANyPlxEbkJMtPV2x0XJHAIEb5eeRVdH2EwvDyCJpmG4HD2ZvQrD7 +xRt1CD/JHkB6CbslYJecoX/S8CQP/CvvAqe/CBB6fgPO72JO8WiOycs6uyT+zb68 +gsTShON829aOiniMMVBMTNqou1TmsVeluS+/iGDTuqZwJ346HyH9DMkDdVmhYnKX +TBpjheOKX3mCiqicetG1SIFZVdQeGblWZApf5dboWoRdD0IXLil7HhogX+3SBsxs +pKR1w3vcIJN0MFypJA6xXoqEsQHVjPTaxKq2KocHgox/+LX91rX8dq/opq9ODG0s +dyq5yhoHDbOeIK8Avi5kmszN5PAdU2/Ng62e41PaM+8dgjbcqLAQHMr1jxXOGtup +8GJuK9y/fegBxrtOCUI4Z+bn0ff5T/Asnox4NAJGVeMscm1R6B0ONLP31lkcrqay +oSVLAmD3Wddpb6svk/U1WOwnQJxLB4ICZ+3pdrUQHML3w2QMlvzCwtlkBCe01Mkv +4+rVSUKi8ux+4wz/c/Z7mpS/W1f0DZ08sVK8r/RpmyZc/AkSxn28013CNKPx1ZsL +ITF1LZ23Gtgh/igaSWfm +=tdKp +-----END PGP SIGNATURE----- diff --git a/grep.changes b/grep.changes index 4e88493..9fcc4e3 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Feb 19 10:32:43 UTC 2014 - mvyskocil@suse.com + +- update to 2.17 + * grep -i in a multibyte locale is now typically 10 times faster + for patterns that do not contain \ or [ + * grep (without -i) in a multibyte locale is now up to 7 times faster + when processing many matched lines + * grep's --mmap option was disabled in March of 2010, and began to + elicit a warning in January of 2012. Now it is completely gone. +- Reformat spec file using hints from spec-cleaner + ------------------------------------------------------------------- Sun Jan 5 14:01:24 UTC 2014 - andreas.stieger@gmx.de diff --git a/grep.spec b/grep.spec index 1c551de..718519b 100644 --- a/grep.spec +++ b/grep.spec @@ -17,23 +17,25 @@ Name: grep +Version: 2.17 +Release: 0 +Summary: Print lines matching a pattern +License: GPL-3.0+ +Group: Productivity/Text/Utilities +Url: http://www.gnu.org/software/grep/ +Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +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 + BuildRequires: makeinfo BuildRequires: pcre-devel 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.16 -Release: 0 -Summary: Print lines matching a pattern -License: GPL-3.0+ -Group: Productivity/Text/Utilities -Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz -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 +Requires(pre): %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,7 +51,7 @@ echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre. %build %ifarch ppc ppc64 -export CFLAGS="$RPM_OPT_FLAGS -mlong-double-64" +export CFLAGS="%{optflags} -mlong-double-64" %endif %if 0%{?suse_version} < 1120 %configure -C --bindir=/bin --disable-silent-rules @@ -58,15 +60,15 @@ export CFLAGS="$RPM_OPT_FLAGS -mlong-double-64" %else %configure --disable-silent-rules --without-included-regex %endif -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %check -make check VERBOSE=1 +make check VERBOSE=1 %{?_smp_mflags} %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} %if 0%{?suse_version} < 1120 -install -d %{buildroot}/usr/bin +install -d %{buildroot}%{_bindir} ln -sf ../../bin/egrep %{buildroot}%{_bindir}/egrep ln -sf ../../bin/fgrep %{buildroot}%{_bindir}/fgrep ln -sf ../../bin/grep %{buildroot}%{_bindir}/grep @@ -78,7 +80,7 @@ ln -sf %{_bindir}/fgrep %{buildroot}/bin/fgrep ln -sf %{_bindir}/grep %{buildroot}/bin/grep #EndUsrMerge %endif -%find_lang %name +%find_lang %{name} %post %install_info --info-dir=%{_infodir} %{_infodir}/grep.info.gz @@ -86,9 +88,9 @@ ln -sf %{_bindir}/grep %{buildroot}/bin/grep %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/grep.info.gz -%files -f %name.lang +%files -f %{name}.lang %defattr(-,root,root) -%doc README AUTHORS NEWS THANKS TODO COPYING ChangeLog* +%doc README AUTHORS NEWS THANKS TODO COPYING ChangeLog* %if 0%{?suse_version} < 1120 /bin/* %else