[xemacs/el6: 12/12] Merge branch 'master' into el6

[stevetraylen]

commit dbeab83d2c821acb9dbe57a097a871de2209d5c1
Merge: 613c979 776cfdf
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sat Mar 17 09:24:12 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	xemacs.spec

 .gitignore                                 |    2 +-
 gnuclient.desktop                          |   11 ++
 sources                                    |    2 +-
 xemacs-21.5.25-mk-nochk-features.patch     |    6 +-
 xemacs-21.5.25-wnnfix-128362.patch         |   18 +-
 xemacs-21.5.25-x-paths.patch               |   22 ---
 xemacs-21.5.26-utf8-fonts.patch            |   10 +-
 xemacs-21.5.27-no-expdyn-ia64-106744.patch |   54 +++----
 xemacs-21.5.28-courier-default.patch       |   12 +-
 xemacs-21.5.29-arabic-547840.patch         |  233 --------------------------
 xemacs-21.5.29-destdir.patch               |  249 +++++++++++-----------------
 xemacs-21.5.29-dired-550145.patch          |   28 ---
 xemacs-21.5.29-etags-memmove-545399.patch  |   31 ----
 xemacs-21.5.29-image-overflow.patch        |   83 ---------
 xemacs-21.5.29-no-xft.patch                |   39 -----
 xemacs-21.5.29-png.patch                   |  133 ---------------
 xemacs-21.5.29-tty-font-512623.patch       |  133 ---------------
 xemacs-21.5.29-x-server.patch              |    7 +-
 xemacs-21.5.31-get-other-frame.patch       |   11 ++
 xemacs-21.5.31-lib-src.patch               |   20 +++
 xemacs-21.5.31-view-mode.patch             |   10 +
 xemacs-beta-infodir.patch                  |   12 --
 xemacs.desktop                             |    3 +-
 xemacs.spec                                |  232 ++++++++++++++++----------
 24 files changed, 349 insertions(+), 1012 deletions(-)
---
diff --cc xemacs.spec
index 8c66e1d,27a462a..4611f72
--- a/xemacs.spec
+++ b/xemacs.spec
@@@ -20,8 -20,8 +20,8 @@@
  %global majver  21.5
  
  Name:           xemacs
- Version:        21.5.29
- Release:        15%{?snap:.%{snap}}%{?dist}.2
+ Version:        21.5.31
 -Release:        4%{?snap:.%{snap}}%{?dist}
++Release:        5%{?snap:.%{snap}}%{?dist}
  Summary:        Different version of Emacs
  
  Group:          Applications/Editors
@@@ -663,14 -663,59 +663,68 @@@ f
  %endif
  %{_libdir}/pkgconfig/xemacs.pc
  
+ %files filesystem
+ %dir %{_datadir}/xemacs
+ %dir %{_datadir}/xemacs/site-lisp
+ %dir %{_datadir}/xemacs/site-packages
+ %dir %{_datadir}/xemacs/site-packages/etc
+ %dir %{_datadir}/xemacs/site-packages/info
+ %dir %{_datadir}/xemacs/site-packages/lib-src
+ %dir %{_datadir}/xemacs/site-packages/lisp
+ %dir %{_datadir}/xemacs/site-packages/lisp/site-start.d
+ %dir %{_datadir}/xemacs/site-packages/man
+ %dir %{_datadir}/xemacs/site-packages/pkginfo
  
  %changelog
++* Fri Mar 16 2012 Steve Traylen <steve.traylen at cern.ch> - 21.5.31-5
++- Rebase to Fedora xemacs rhbz#786277
++
+ * Sat Jan  7 2012 Jerry James <loganjerry at gmail.com> - 21.5.31-4
+ - Rebuild for GCC 4.7
+ - Minor spec file cleanups
+ 
+ * Mon Nov  7 2011 Jerry James <loganjerry at gmail.com> - 21.5.31-3
+ - Rebuild with new libpng
+ 
+ * Wed Oct 26 2011 Marcela Mašláňová <mmaslano at redhat.com> - 21.5.31-2.2
+ - rebuild with new gmp without compat lib
+ 
+ * Wed Oct 12 2011 Peter Schiffer <pschiffe at redhat.com> - 21.5.31-2.1
+ - rebuild with new gmp
+ 
+ * Fri Aug  5 2011 Jerry James <loganjerry at gmail.com> - 21.5.31-2
+ - Build --with-union-type to avoid a make-int bug in lisp-disunion.h
+ - Add view-mode patch (bz 709399)
+ - Add get-other-frame patch from upstream
+ - Add lib-src patch to eliminate unnecessary linkage
+ 
+ * Tue May  3 2011 Jerry James <loganjerry at gmail.com> - 21.5.31-1
+ - Update to 21.5.31
+ - License is now GPLv3+
+ - Drop upstreamed patches: x-paths, image-overflow, no-xft, png, tty-font,
+   etags-memmove, arabic, dired, infodir
+ - Rebase and renumber remaining patches
+ - Drop workaround for ancient alternatives bug
+ 
+ * 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).
+ - 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
+ 
 +* Fri Dec  3 2010 Steve Traylen <steve.traylen at cern.ch> - 21.5.29-15 2
 +- Correct previous wrong date on last change log entry.
 +
 +* Wed Dec  3 2010 Steve Traylen <steve.traylen at cern.ch> - 21.5.29-15 1
 +- Merge Fedora 15 .spec file to EPEL6.
 +
  * 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.