[xorg-x11-twm] - Merge-review cleanup (#226645)

[paragn]

commit 4272ed03dc19e17da6f7619727163bfedd6bb6db
Author: paragn <paragn at fedoraproject.org>
Date:   Mon Sep 27 16:00:16 2010 +0530

    - Merge-review cleanup (#226645)

 xorg-x11-twm.spec |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/xorg-x11-twm.spec b/xorg-x11-twm.spec
index 6d5cf1a..26ce430 100644
--- a/xorg-x11-twm.spec
+++ b/xorg-x11-twm.spec
@@ -3,13 +3,13 @@ Name: xorg-x11-twm
 # NOTE: Remove Epoch line if package gets renamed to something like "twm"
 Epoch: 1
 Version: 1.0.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 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/twm-%{version}.tar.bz2
+#Fedora specific patch.
 Patch0: twm-1.0.3-add-needed.patch
 
 BuildRequires: pkgconfig
@@ -28,6 +28,7 @@ BuildRequires: xorg-x11-util-macros
 # FIXME: monolithic twm packaging has a hard dep on xterm, which might still
 # be required.  We'll have to examine the twm configuration files.
 #Requires: xterm
+# FIXME:These old provides should be removed
 Provides: twm
 
 %description
@@ -38,38 +39,34 @@ X.Org X11 twm window manager
 %patch0 -p1 -b .add-needed
 
 %build
-# FIXME: Work around pointer aliasing warnings from compiler for now
 autoreconf -v --install
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure
-make
+%configure 
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # FIXME: Upstream sources do not create the system wide twm config dir, nor
 # install the default config file currently.  We'll work around it here for now.
 {
    echo "FIXME: Upstream doesn't install systemwide config by default"
    mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/twm
-   install -m 0644 src/system.twmrc $RPM_BUILD_ROOT%{_sysconfdir}/X11/twm/
+   install -p -m 0644 src/system.twmrc $RPM_BUILD_ROOT%{_sysconfdir}/X11/twm/
    rm $RPM_BUILD_ROOT%{_datadir}/X11/twm/system.twmrc
 }
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README ChangeLog
+%doc COPYING ChangeLog
 %{_bindir}/twm
-#%dir %{_mandir}/man1x
 %{_mandir}/man1/twm.1*
 %dir %{_sysconfdir}/X11/twm
 %config %{_sysconfdir}/X11/twm/system.twmrc
 
 %changelog
+* Sat Sep 25 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.0.3-7
+- Merge-review cleanup (#226645)
+
 * Tue Feb 09 2010 Adam Jackson <ajax at redhat.com> 1.0.3-6
 - twm-1.0.3-add-needed.patch: Fix FTBFS for --no-add-needed