[xemacs/f14/master: 6/6] Merge fixes from Rawhide.

[Jerry James]

commit 0b9d5d3eca236f964ebdf096c0f3ddd495e81684
Author: Jerry James <loganjerry at gmail.com>
Date:   Wed Mar 2 09:51:34 2011 -0700

    Merge fixes from Rawhide.

 xemacs.spec |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/xemacs.spec b/xemacs.spec
index 1f1bd8e..4e78221 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -21,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        18%{?snap:.%{snap}}%{?dist}
+Release:        14%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -709,27 +709,16 @@ fi
 %dir %{_datadir}/xemacs/site-packages/pkginfo
 
 %changelog
-* Tue Mar  1 2011 Jerry James <loganjerry at gmail.com> - 21.5.29-18
-- Make -filesystem subpackage be noarch.
-
-* Tue Mar  1 2011 Jerry James <loganjerry at gmail.com> - 21.5.29-17
-- Add filesystem subpackage (bz 672093).
+* Wed Mar  2 2011 Jerry James <loganjerry at gmail.com> - 21.5.29-14
+- Add noarch filesystem subpackage (bz 672093) with subdirs of site-packages.
 - Add gnuclient desktop file.
 - Fix CFLAGS so -fno-strict-aliasing actually gets used.
 - Add . to the default load-path in _xemacs_bytecompile.
 - Update Requires for pre/post(un) scripts.
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 21.5.29-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Dec  1 2010 Jerry James <loganjerry at gmail.com> - 21.5.29-15
 - Don't create /var/lock/xemacs; it is not used (bz 656723).
 - Drop the BuildRoot tag.
 - Ship COPYING with the -info subpackage.
 
-* Wed Nov 10 2010 Jerry James <loganjerry at gmail.com> - 21.5.29-14
-- Create and own subdirectories of site-packages
-
 * Tue Jul  6 2010 Jerry James <loganjerry at gmail.com> - 21.5.29-13
 - Add db4 support (bz 581614).
 - Add -xft subpackage (bz 356961).