From a2ec05b619bfd4b7557c9ad910704eb014109bd6 Mon Sep 17 00:00:00 2001
From: paragn <paragn@fedoraproject.org>
Date: Sep 27 2010 09:42:48 +0000
Subject: - Merge-review cleanup (#226655)


---

diff --git a/xorg-x11-xsm.spec b/xorg-x11-xsm.spec
index 2d340c9..0504ec0 100644
--- a/xorg-x11-xsm.spec
+++ b/xorg-x11-xsm.spec
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The Version field should be the version of the xsm tarball.
 Version: 1.0.2
 # Bump the release on rebuilds/bugfixes/etc.
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -14,6 +14,8 @@ Source0: ftp://ftp.x.org/pub/individual/app/xsm-1.0.1.tar.bz2
 Source1: ftp://ftp.x.org/pub/individual/app/smproxy-1.0.2.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/app/rstart-1.0.2.tar.bz2
 
+# Fedora specific patches
+
 # Patches for xsm (10-19)
 Patch10: xsm-1.0.1-xsm-installation-location-fixes.patch
 Patch11: xsm-1.0.1-add-needed.patch
@@ -33,13 +35,11 @@ BuildRequires: libXaw-devel libXext-devel libXt-devel libXpm-devel
 BuildRequires: rsh
 
 # rstart script invokes xauth, rsh
-Requires: xauth, rsh
+Requires: xorg-x11-xauth, rsh
 
+# FIXME:These old provided should be removed
 Provides: xsm, smproxy, rstart, rstartd
 
-# NOTE: xsm, smproxy, rstart used to be part of the XFree86/xorg-x11 package
-Obsoletes: XFree86, xorg-x11
-
 %description
 X.Org X11 X Session Manager
 
@@ -52,42 +52,30 @@ X.Org X11 X Session Manager
 
 %build
 # Build everything
-
 for pkg in xsm smproxy rstart ; do
     pushd $pkg-*
 
     sed -i '/XAW_/ s/)/, xaw7)/; /XAW_/ s/XAW_CHECK_XPRINT_SUPPORT/PKG_CHECK_MODULES/' configure.ac
     aclocal ; automake ; autoconf
 
-    %configure --disable-xprint
-    make
+    %configure
+    make  %{?_smp_mflags}
     popd
 done
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # Install everything
 {
    for pkg in xsm smproxy rstart ; do
       pushd $pkg-*
-      make install DESTDIR=$RPM_BUILD_ROOT
+      make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
       popd
    done
 }
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
-# FIXME: The rpm package version was accidentally bumped to 1.0.2, so we
-# can't use the %%version macro here until a upstream xsm is released as
-# version 1.0.2 or higher.
-#%doc xsm-%{version}/AUTHORS xsm-%{version}/COPYING xsm-%{version}/INSTALL
-#%doc xsm-%{version}/NEWS xsm-%{version}/README xsm-%{version}/ChangeLog
-%doc xsm-1.0.1/AUTHORS xsm-1.0.1/COPYING xsm-1.0.1/INSTALL
-%doc xsm-1.0.1/NEWS xsm-1.0.1/README xsm-1.0.1/ChangeLog
+%doc xsm-1.0.1/COPYING xsm-1.0.1/README xsm-1.0.1/ChangeLog
 
 %{_bindir}/rstart
 %{_bindir}/rstartd
@@ -110,7 +98,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/X11/rstart
 # NOTE: This binary can and probably should sit in /usr/sbin, but oh well.
 %{_libdir}/X11/rstart/rstartd.real
-#%dir %{_mandir}/man1x
 %{_mandir}/man1/rstart.1*
 %{_mandir}/man1/rstartd.1*
 %{_mandir}/man1/smproxy.1*
@@ -121,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Sat Sep 25 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.0.2-15
+- Merge-review cleanup (#226655)
+
 * Fri Mar 05 2010 Matěj Cepl <mcepl@redhat.com> - 1.0.2-14
 - Fixed bad directory ownership of /usr/share/X11