From 7c869c97b4a6b250559b59fc2886ccea40679f24 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mar 06 2007 11:21:05 +0000
Subject: - Fixed buildroot (bug #225695).

- Build should not require gzip or bzip2 as these are exceptions (bug
    #225695).
- Added SMP make flags (bug #225695).
- Avoid makeinstall macro (bug #225695).
- Better defattr (bug #225695).
- Fixed summary (bug #225695).
- Avoid macros in changelog (bug #225695).
- Resolves: rhbz#225695 rhbz#225695 rhbz#225695 rhbz#225695 rhbz#225695
    rhbz#225695 rhbz#225695

---

diff --git a/diffstat.spec b/diffstat.spec
index 6f59d11..b0190da 100644
--- a/diffstat.spec
+++ b/diffstat.spec
@@ -1,15 +1,13 @@
-Summary: A utility which provides statistics based on the output of diff.
+Summary: A utility which provides statistics based on the output of diff
 Name: diffstat
 Version: 1.43
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Tools
 License: distributable
 URL: http://invisible-island.net/diffstat
+# Note that the upstream tarball is unversioned, just %{name}.tar.gz
 Source: ftp://invisible-island.net/diffstat/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
-
-# Autoconf tests check for these.
-BuildRequires: gzip, bzip2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The diff command compares files line by line.  Diffstat reads the
@@ -25,21 +23,30 @@ diff command's output.  You'll need to also install diffutils.
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall mandir=$RPM_BUILD_ROOT%{_mandir}
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/diffstat
 %{_mandir}/*/*
 
 %changelog
+* Tue Mar  6 2007 Tim Waugh <twaugh@redhat.com> 1.43-2
+- Fixed buildroot (bug #225695).
+- Build should not require gzip or bzip2 as these are exceptions (bug #225695).
+- Added SMP make flags (bug #225695).
+- Avoid makeinstall macro (bug #225695).
+- Better defattr (bug #225695).
+- Fixed summary (bug #225695).
+- Avoid macros in changelog (bug #225695).
+
 * Thu Jan 11 2007 Tim Waugh <twaugh@redhat.com> 1.43-1
 - 1.43.  Fixes bug #187350.  No longer need compress patch.
 
@@ -108,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed May 31 2000 Ngo Than <than@redhat.de>
 - rebuild for 7.0
 - put man page in /usr/share/man/*
-- use %configure
+- use %%configure
 - fix makefile.in
 - cleanup specfile