[packages/golang] up to 1.4.2, vim and emacs seem dropped

glen glen at pld-linux.org
Thu May 21 11:46:51 CEST 2015


commit 70d9b5f7e9a41337fe031b28d59a731e5c89ed69
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 21 12:11:03 2015 +0300

    up to 1.4.2, vim and emacs seem dropped

 ca-certs.patch |  4 ++--
 golang.spec    | 27 ++++++++++++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 197af40..480140d 100644
--- a/golang.spec
+++ b/golang.spec
@@ -4,23 +4,25 @@
 # - setup GOMAXPROCS=2 from _smp_mflags
 # - fix CC containing spaces (ccache)
 # - check if hg use at build time can be dropped
+# - build all target archs, subpackage them: http://golang.org/doc/install/source#environment
+# - subpackage -src files?
 
 # Conditional build:
 %bcond_without	tests	# build without tests
 %bcond_without	verbose	# verbose build (V=1)
-%bcond_without	emacs	# Go mode for Emacs
-%bcond_without	vim	# Go syntax files for Vim
+%bcond_with	emacs	# Go mode for Emacs
+%bcond_with	vim	# Go syntax files for Vim
 
 Summary:	Go compiler and tools
 Summary(pl.UTF-8):	Kompilator języka Go i narzędzia
 Name:		golang
-Version:	1.3.3
-Release:	1
+Version:	1.4.2
+Release:	0.1
 License:	BSD
 Group:		Development/Languages
-#Source0Download: https://code.google.com/p/go/downloads/list
+# Source0Download: https://golang.org/dl/
 Source0:	https://storage.googleapis.com/golang/go%{version}.src.tar.gz
-# Source0-md5:	2cdbad6baefcf1007f3cf54a5bc878b7
+# Source0-md5:	907f85c8fa765d31f7f955836fec4049
 Patch0:		ca-certs.patch
 URL:		http://golang.org/
 BuildRequires:	bash
@@ -111,9 +113,6 @@ Tryb Go dla Emacsa.
 mv go/* .
 %patch0 -p1
 
-# broken tests
-%{__rm} src/pkg/net/multicast_test.go
-
 cat > env.sh <<'EOF'
 export GOROOT=$(pwd)
 export GOROOT_FINAL=%{_libdir}/%{name}
@@ -149,8 +148,7 @@ GOROOT=$RPM_BUILD_ROOT%{_libdir}/%{name}
 install -d $GOROOT/{misc,lib,src}
 install -d $RPM_BUILD_ROOT%{_bindir}
 
-cp -a pkg include lib bin $GOROOT
-cp -a src/pkg src/cmd $GOROOT/src
+cp -a pkg include lib bin src $GOROOT
 cp -a misc/cgo $GOROOT/misc
 # kill Win32 and Plan9 scripts
 find $GOROOT -name '*.bat' -o -name '*.rc' | xargs %{__rm}
@@ -234,11 +232,18 @@ 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/compress
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/container
 %{_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/hash
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/internal
 %{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/io
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/math
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/mime
+%{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/net
 %{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/os
 %{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/path
 %{_libdir}/%{name}/pkg/linux_%{GOARCH}_race/regexp
diff --git a/ca-certs.patch b/ca-certs.patch
index 4c856ac..f17393c 100644
--- a/ca-certs.patch
+++ b/ca-certs.patch
@@ -1,5 +1,5 @@
---- 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
+--- golang-1.4.2/src/crypto/x509/root_unix.go~	2015-05-21 11:15:20.000000000 +0300
++++ golang-1.4.2/src/crypto/x509/root_unix.go	2015-05-21 11:15:26.427510756 +0300
 @@ -10,6 +10,7 @@
  
  // Possible certificate files; stop after finding one.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/golang.git/commitdiff/70d9b5f7e9a41337fe031b28d59a731e5c89ed69



More information about the pld-cvs-commit mailing list