From 4108fdc89b8eabc99a125ebd2c005b3cf1671741 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Tue, 20 Jul 2010 00:31:05 +0000
Subject: [PATCH] - Spec file cleanup. Patch from Parag An. (#226646)

---
 xorg-x11-util-macros.spec | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/xorg-x11-util-macros.spec b/xorg-x11-util-macros.spec
index 2f3434b..4d7c981 100644
--- a/xorg-x11-util-macros.spec
+++ b/xorg-x11-util-macros.spec
@@ -4,15 +4,12 @@
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
 Version: 1.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-
 Source0:  ftp://ftp.x.org/pub/individual/util/util-macros-%{version}.tar.bz2
-
 Requires: autoconf automake libtool pkgconfig
 
 %description
@@ -24,16 +21,11 @@ comprise the X Window System.
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/usr/share/util-macros/INSTALL
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+rm -f $RPM_BUILD_ROOT%{_datadir}/util-macros/INSTALL
 
 %files
 %defattr(-,root,root,-)
@@ -42,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xorg-macros.pc
 
 %changelog
+* Tue Jul 20 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.10.0-2
+- Spec file cleanup. Patch from Parag An. (#226646)
+
 * Mon Jun 28 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.10.0-1
 - util-macros 1.10.0