[golang/el6] fix gdb init for safe-paths

[Vincent Batts]

commit 8712265c7e57f7415c1cc5b30ff96e882b2d8949
Author: Vincent Batts <vbatts at redhat.com>
Date:   Tue Jul 15 12:30:16 2014 -0400

    fix gdb init for safe-paths
    
    bz981356
    
    Conflicts:
    
    	golang.spec

 golang-gdbinit |    1 -
 golang.spec    |   11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/golang-gdbinit b/golang-gdbinit
index 0a32958..4ef690b 100644
--- a/golang-gdbinit
+++ b/golang-gdbinit
@@ -1,2 +1 @@
 add-auto-load-safe-path /usr/lib/golang/src/pkg/runtime/runtime-gdb.py
-add-auto-load-safe-path /usr/lib64/golang/src/pkg/runtime/runtime-gdb.py
diff --git a/golang.spec b/golang.spec
index 6f769e2..4693899 100644
--- a/golang.spec
+++ b/golang.spec
@@ -39,7 +39,7 @@
 
 Name:           golang
 Version:        1.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        The Go Programming Language
 
 License:        BSD
@@ -544,7 +544,7 @@ cp -av misc/zsh/go $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
 
 # gdbinit
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d
-cp -av %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d/golang
+cp -av %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d/golang.gdb
 
 # prelink blacklist
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d
@@ -884,7 +884,10 @@ fi
 
 
 %changelog
-* Tue Jul 08 2014 Vincent Batts <vbatts at fedoraproejct.org> - 1.2.2-8
+* Tue Jul 15 2014 Vincent Batts <vbatts at fedoraproject.org> - 1.2.2-9
+- fix the loading of gdb safe-path. bz981356
+
+* Tue Jul 08 2014 Vincent Batts <vbatts at fedoraproject.org> - 1.2.2-8
 - `go install std` requires gcc, to build cgo. bz1105901, bz1101508
 
 * Wed May 21 2014 Vincent Batts <vbatts at redhat.com> 1.2.2-7
@@ -934,7 +937,7 @@ fi
 * Tue Mar 04 2014 Adam Miller <maxamillion at fedoraproject.org> 1.2.1-1
 - Update to latest upstream
 
-* Thu Feb 20 2014 Adam Miller <maxamillion at fedoraproejct.org> 1.2-7
+* Thu Feb 20 2014 Adam Miller <maxamillion at fedoraproject.org> 1.2-7
 - Remove  _BSD_SOURCE and _SVID_SOURCE, they are deprecated in recent
   versions of glibc and aren't needed