From 4e9ad623890284116ac4421c19d83c59506a450f Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 1 Sep 2010 09:51:44 -0400
Subject: [PATCH] merge review cleanup

---
 xorg-x11-xauth.spec | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/xorg-x11-xauth.spec b/xorg-x11-xauth.spec
index 57d43ae..7a27361 100644
--- a/xorg-x11-xauth.spec
+++ b/xorg-x11-xauth.spec
@@ -3,13 +3,12 @@
 Summary: X.Org X11 X authority utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/app/%{pkgname}-%{version}.tar.bz2
 Source10: mkxauth
@@ -24,14 +23,6 @@ BuildRequires: libXmu-devel
 Provides: xauth
 Provides: mkxauth
 
-Obsoletes: XFree86-xauth, mkxauth
-
-# NOTE: xauth moved from the XFree86 package to XFree86-xauth in
-# XFree86-4.2.0-50.11, so this Obsoletes line is required for upgrades
-# from RHL 8 and older, and RHEL 2.1 to work properly when upgrading to
-# a newer OS release.
-Obsoletes: XFree86 < 4.2.0-50.11
-
 %description
 xauth is used to edit and display the authorization information
 used in connecting to an X server.
@@ -41,7 +32,7 @@ used in connecting to an X server.
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,8 +40,8 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 # Install mkxauth
 {
-   install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/
-   install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1/mkxauth.1x
+   install -p -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/
+   install -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1/mkxauth.1x
 }
 
 %clean
@@ -58,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README ChangeLog
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/xauth
 %{_bindir}/mkxauth
 #%dir %{_mandir}/man1x
@@ -66,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/mkxauth.1*
 
 %changelog
+* Mon Aug 30 2010 Adam Jackson <ajax@redhat.com> 1.0.2-8
+- Merge review cleanups (#226648)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild