up to 1.2.1; more race libraries

diff --git a/ca-certs.patch b/ca-certs.patch
index 36ad4108a65b0b7ba215a1eb3828444a396b8fe1..4c856ac5108f448fe2dbd27aa6186aab82f4647b 100644 (file)
--- a/ca-certs.patch
+++ b/ca-certs.patch
@@ -1,10 +1,10 @@
---- go-1.1.2/src/pkg/crypto/x509/root_unix.go~ 2013-08-13 08:45:24.000000000 +0300
-+++ go-1.1.2/src/pkg/crypto/x509/root_unix.go  2013-08-21 20:45:30.044974438 +0300
+--- golang-1.2.1/src/pkg/crypto/x509/root_unix.go~     2014-03-03 02:57:17.000000000 +0200
++++ golang-1.2.1/src/pkg/crypto/x509/root_unix.go      2014-03-13 10:20:37.213363038 +0200
 @@ -10,6 +10,7 @@
  
  // Possible certificate files; stop after finding one.
  var certFiles = []string{
 +      "/etc/certs/ca-certificates.crt",         // PLD Linux
-       "/etc/ssl/certs/ca-certificates.crt",     // Linux etc
+       "/etc/ssl/certs/ca-certificates.crt",     // Debian/Ubuntu/Gentoo etc.
        "/etc/pki/tls/certs/ca-bundle.crt",       // Fedora/RHEL
        "/etc/ssl/ca-bundle.pem",                 // OpenSUSE

diff --git a/golang.spec b/golang.spec
index e9084aad52cf79428af6455c35d790448f95e321..37171fd80ada4c571e44a03ea8f69ffa046dcaaf 100644 (file)
--- a/golang.spec
+++ b/golang.spec
@@ -12,13 +12,13 @@
 Summary:       Go compiler and tools
 Summary(pl.UTF-8):     Kompilator języka Go i narzędzia
 Name:          golang
-Version:       1.1.2
+Version:       1.2.1
 Release:       1
 License:       BSD
 Group:         Development/Languages
 #Source0Download: https://code.google.com/p/go/downloads/list
 Source0:       https://go.googlecode.com/files/go%{version}.src.tar.gz
-# Source0-md5: 705feb2246c8ddaf820d7e171f1430c5
+# Source0-md5: 6232fa4417004fc9dde823ad1eaf597c
 Patch0:                ca-certs.patch
 URL:           http://golang.org/
 BuildRequires: bash
@@ -31,13 +31,11 @@ Requires:   ca-certificates
 ExclusiveArch: %{ix86} %{x8664} %{arm}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define _enable_debug_packages 0
 %define no_install_post_strip 1
 %define no_install_post_chrpath 1
+%define _enable_debug_packages 0
 %define _noautoreqfiles %{_libdir}/%{name}/src
 
-%define                _vimdatadir     %{_datadir}/vim
-
 %ifarch %{ix86}
 %define        GOARCH 386
 %endif
@@ -45,6 +43,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        GOARCH amd64
 %endif
 
+%define                _vimdatadir     %{_datadir}/vim
+
 %description
 Go is an open source programming environment that makes it easy to
 build simple, reliable, and efficient software.
@@ -134,7 +134,6 @@ nflags="\"$(echo '%{rpmcflags}' | sed -e 's/^[      ]*//;s/[        ]*$//;s/[       ]\+/ /g' -e
 %{__sed} -i -e "s/\"-O2\"/$nflags/" src/cmd/dist/build.c
 # NOTE: optflags used in gcc calls from go compiler are in src/cmd/go/build.go
 
-
 %build
 . ./env.sh
 
@@ -227,6 +226,13 @@ rm -rf $RPM_BUILD_ROOT
 %ifarch %{x8664}
 %dir %{_libdir}/%{name}/pkg/linux_%{GOARCH}_race
 %{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/*.a
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/crypto
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/debug
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/encoding
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/go
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/io
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/os
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/path
 %{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/regexp
 %{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/runtime
 %{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/sync