From 138627366742e167f2aac26b4c4451d5fa4250d6 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Aug 02 2015 16:14:04 +0000
Subject: Minor spec cleanups and modifications, Drop Changelog, details in NEWS


---

diff --git a/grep.spec b/grep.spec
index c13a65e..5d6368d 100644
--- a/grep.spec
+++ b/grep.spec
@@ -3,9 +3,11 @@
 Summary: Pattern matching utilities
 Name: grep
 Version: 2.21
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
+URL: http://www.gnu.org/software/grep/
 Group: Applications/Text
+
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
 Source1: colorgrep.sh
 Source2: colorgrep.csh
@@ -20,10 +22,9 @@ Patch2: grep-2.21-buf-overrun-fix.patch
 # backported from upstream
 # http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c8b9364d5900a40809827aee6cc53705073278f6
 Patch3: grep-2.21-recurse-behaviour-change-doc.patch
-URL: http://www.gnu.org/software/grep/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
 BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext
 BuildRequires: autoconf automake
 # https://fedorahosted.org/fpc/ticket/174
@@ -60,7 +61,6 @@ chmod 755 tests/kwset-abuse
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 gzip $RPM_BUILD_ROOT%{_infodir}/grep*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -74,9 +74,6 @@ install -Dpm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/grepconf.sh
 %check
 make check
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
 %post
 /sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/grep.info.gz || :
 
@@ -86,8 +83,7 @@ if [ $1 = 0 ]; then
 fi
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog
+%doc AUTHORS THANKS TODO NEWS README
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 
@@ -99,6 +95,10 @@ fi
 %{_libexecdir}/grepconf.sh
 
 %changelog
+* Sun Aug  2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.21-7
+- Minor spec cleanups and modifications
+- Drop Changelog, details in NEWS
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.21-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild