[golang/el6: 13/14] Merge branch 'f21' into f20

[Vincent Batts]

commit 8350bb0fe460426b1c6043285111ba664de7acdd
Merge: 9de436f a8686d8
Author: Vincent Batts <vbatts at hashbangbash.com>
Date:   Thu Mar 19 10:48:35 2015 -0400

    Merge branch 'f21' into f20

 .gitignore                                 |   8 +-
 go1.3-tar-fix_writing_of_pax_headers.patch | 110 --------------
 go1.3-tar_reuse_buffer_readHeader.patch    |  64 --------
 go1.3-tar_reuse_buffer_writeHeader.patch   |  56 -------
 golang-1.2-archive_tar-xattr.patch         | 197 ------------------------
 golang-1.2-remove-ECC-p224.patch           |  40 ++---
 golang-1.2-skipCpuProfileTest.patch        |  12 --
 golang-f21-hostname.patch                  |   4 +-
 golang.spec                                | 231 +++++++----------------------
 sources                                    |   2 +-
 10 files changed, 83 insertions(+), 641 deletions(-)
---
diff --cc golang.spec
index 47a480e,33cff31..6b70165
--- a/golang.spec
+++ b/golang.spec
@@@ -63,9 -61,8 +64,7 @@@ BuildRequires:  /bin/hostnam
  
  Provides:       go = %{version}-%{release}
  Requires:       golang-bin
- Requires:       golang-src
- 
- BuildRequires:  emacs
+ Requires:       golang-src = %{version}-%{release}
 -
  Patch0:         golang-1.2-verbose-build.patch
  
  # https://bugzilla.redhat.com/show_bug.cgi?id=1038683