From 3c7369d76bfd5e475a79d1bed3a382cf1183febf Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Jun 22 2006 04:39:38 +0000
Subject: - Added xsm documentation to doc macro.

- The 1.0.2-1 build had the version accidentally bumped to 1.0.2 before an
    xsm-1.0.2 was available, so I had to hard code the actual 1.0.1 version
    in a few places temporarily until xsm-1.0.2 is available.

---

diff --git a/xorg-x11-xsm.spec b/xorg-x11-xsm.spec
index 88e4b08..5de39c3 100644
--- a/xorg-x11-xsm.spec
+++ b/xorg-x11-xsm.spec
@@ -2,12 +2,15 @@
 
 Summary: X.Org X11 X Session Manager
 Name: xorg-x11-%{pkgname}
+# NOTE: The Version field should be the version of the xsm tarball.
 Version: 1.0.2
-Release: 2
+# Bump the release on rebuilds/bugfixes/etc.
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://xorg.freedesktop.org/releases/individual/app/xsm-1.0.1.tar.bz2
 Source1: http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.2.tar.bz2
 Source2: http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.2.tar.bz2
@@ -21,10 +24,14 @@ Patch10: xsm-1.0.1-xsm-installation-location-fixes.patch
 # Patches for rstart (30-39)
 Patch30: rstart-1.0.2-rstart-installation-location-fixes.patch
 
-BuildRequires: pkgconfig automake autoconf
+# FIXME: Temporary dependency on automake/autoconf while they're still needed.
+BuildRequires: automake autoconf
+
+BuildRequires: pkgconfig
+BuildRequires: xorg-x11-util-macros
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: libXaw-devel libXext-devel libXt-devel libXpm-devel
 BuildRequires: rsh
-BuildRequires: xorg-x11-proto-devel xorg-x11-util-macros
 
 # NOTE: xorg-x11-filesystem >= 0.99.2-3 is required for OS upgrades from
 # monolithic X releases to modular X releases to work properly.
@@ -82,8 +89,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-# FIXME: Fill in %doc sometime
-%doc
+# 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
+
 %{_bindir}/rstart
 %{_bindir}/rstartd
 %{_bindir}/smproxy
@@ -120,6 +133,12 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-3
+- Added xsm documentation to doc macro.
+- The 1.0.2-1 build had the version accidentally bumped to 1.0.2 before
+  an xsm-1.0.2 was available, so I had to hard code the actual 1.0.1 version
+  in a few places temporarily until xsm-1.0.2 is available.
+
 * Tue May 30 2006 Adam Jackson <ajackson@redhat.com> 1.0.2-2
 - Fix BuildRequires (#191802)