[golang/epel7: 5/5] Merge branch 'master' into epel7

[Adam Miller]

commit c773818a7b113771223d1dee8c6c4da4dcde7af9
Merge: bb2aeae 64f9c14
Author: Adam Miller <admiller at redhat.com>
Date:   Thu Feb 20 15:06:43 2014 -0600

    Merge branch 'master' into epel7
    
    * master:
      fix BSD/SVID patch, and fix up changelog entry (rpmlint was complaining about invalid date)
      update hostname patch
      fix patchlevel for patch200
      re-order some patches, remove unneeded glibc deprecated macros _BSD_SOURCE and _SVID_SOURCE

 golang-1.2-BSD-SVID-SOURCE.patch |   31 +++++++++++++++++++++++++++++++
 golang-f21-hostname.patch        |   10 ++++------
 golang.spec                      |   31 ++++++++++++++++++++++---------
 3 files changed, 57 insertions(+), 15 deletions(-)
---