[golang/el6: 9/13] Merge branch 'master' into el6

[Vincent Batts]

commit 8856b2e16660503d5e285b3d898ea8226c0a731a
Merge: f12359b ce418df
Author: Vincent Batts <vbatts at redhat.com>
Date:   Thu Nov 21 14:08:13 2013 -0500

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

 golang-f21-hostname.patch |   13 ++++
 golang.spec               |  148 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 124 insertions(+), 37 deletions(-)
---
diff --cc golang.spec
index 29ba550,67958c8..cf4854a
--- a/golang.spec
+++ b/golang.spec
@@@ -71,11 -90,12 +90,15 @@@ Summary:        The Go Programming Lang
  #%{summary}.
  
  
 -%package        vim
 -Summary:        Vim plugins for Go
 -Requires:       vim-filesystem
 -BuildArch:      noarch
 +%package vim
 +Summary: Vim plugins for Go
 +BuildArch:   noarch
++# xemacs on fedora only
++%if 0%{?fedora} >= 0
++Requires:    vim-filesystem
++%endif
  
- %description vim
+ %description    vim
  %{summary}.
  
  
@@@ -139,9 -174,14 +178,14 @@@ cd do
  make
  cd ..
  
 -# compile for emacs and xemacs
 +# compile for emacs
  cd misc
  mv emacs/go-mode-load.el emacs/%{name}-init.el
+ # xemacs on fedora only
+ %if 0%{?fedora} >= 0
+ cp -av emacs xemacs
+ %{_xemacs_bytecompile} xemacs/go-mode.el
+ %endif
  %{_emacs_bytecompile} emacs/go-mode.el
  cd ..
  
@@@ -241,8 -294,25 +298,25 @@@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_s
  %{_emacs_sitestartdir}/*.el
  
  
+ # xemacs on fedora only
+ %if 0%{?fedora} >= 0
+ %files -n xemacs-%{name}
+ %doc AUTHORS CONTRIBUTORS LICENSE PATENTS
+ %{_xemacs_sitelispdir}/%{name}
+ %{_xemacs_sitestartdir}/*.el
+ %endif
+ 
+ 
  %changelog
- * Fri Sep 20 2013 Adam Miller <maxamillion at fedoraproject.org> - 1.1.2-4
 -* Thu Nov 20 2013 Vincent Batts <vbatts at redhat.com> - 1.1.2-7
++* Thu Nov 21 2013 Vincent Batts <vbatts at redhat.com> - 1.1.2-7
+ - patch tests for testing on rawhide
+ - let the same spec work for rhel and fedora
+ 
+ * Wed Nov 20 2013 Vincent Batts <vbatts at redhat.com> - 1.1.2-6
+ - don't symlink /usr/bin out to ../lib..., move the file
+ - seperate out godoc, to accomodate the go.tools godoc
+ 
+ * Fri Sep 20 2013 Adam Miller <maxamillion at fedoraproject.org> - 1.1.2-5
  - Pull upstream patches for BZ#1010271
  - Add glibc requirement that got dropped because of meta dep fix