diff --git a/libXScrnSaver.spec b/libXScrnSaver.spec
index 4e8ae68..07fd5a2 100644
--- a/libXScrnSaver.spec
+++ b/libXScrnSaver.spec
@@ -1,16 +1,15 @@
 Summary: X.Org X11 libXss runtime library
 Name: libXScrnSaver
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel >= 7.0-9
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
@@ -28,50 +27,36 @@ X.Org X11 libXss development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
 # FIXME: XScrnSaver.c:429: warning: dereferencing type-punned pointer will break strict-aliasing rules
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
-make
+%configure --disable-static
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# We intentionally don't ship *.la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc COPYING README ChangeLog
 %{_libdir}/libXss.so.1
 %{_libdir}/libXss.so.1.0.0
 
 %files devel
 %defattr(-,root,root,-)
-%if %{with_static}
-%{_libdir}/libXss.a
-%endif
 %{_libdir}/libXss.so
 %{_libdir}/pkgconfig/xscrnsaver.pc
-#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 %{_includedir}/X11/extensions/scrnsaver.h
 
 %changelog
+* Tue Sep 14 2010 Parag Nemade <paragn AT fedoraproject.org> 1.2.0-2
+- Merge-review cleanup (#226087)
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.2.0-1
 - libXScrnSaver 1.2.0