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.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