Hello community, here is the log from the commit of package go for openSUSE:Factory checked in at 2012-04-02 19:50:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go (Old) and /work/SRC/openSUSE:Factory/.go.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "go", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/go/go.changes 2012-03-29 07:45:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.go.new/go.changes 2012-04-02 19:53:03.000000000 +0200 @@ -1,0 +2,36 @@ +Mon Apr 2 09:37:12 UTC 2012 - sasc...@suse.de + +- Fixed some typos +- Removed checks for outdated SUSE versions + +------------------------------------------------------------------- +Mon Apr 2 02:53:46 UTC 2012 - gra...@andtech.eu + +- update profile.d go.sh with $GOBIN for users + +------------------------------------------------------------------- +Mon Apr 2 02:21:51 UTC 2012 - gra...@andtech.eu + +- cmd/go - re-enable building from binary only packages + we are a binary distro and the last minue change to go clean -i + disabled building from third party binary packages. package management + will be done via yast/zypper anyway and not go clean. + +------------------------------------------------------------------- +Sat Mar 31 12:14:51 UTC 2012 - gra...@andtech.eu + +- change provides to match go release string as per VERSION file +- fix %pre, %post etc godoc service statement + +------------------------------------------------------------------- +Fri Mar 30 15:21:31 UTC 2012 - gra...@andtech.eu + +- Export $GOBIN for the %gobuild() macro + +------------------------------------------------------------------- +Wed Mar 28 17:28:24 UTC 2012 - gra...@andtech.eu + +- Go version 1 + http://golang.org/doc/go1.html + +------------------------------------------------------------------- Old: ---- go-0.0.r60.3+hg20120322.tar.bz2 New: ---- allow-binary-only-packages.patch go-1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go.spec ++++++ --- /var/tmp/diff_new_pack.lHA3P8/_old 2012-04-02 19:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.lHA3P8/_new 2012-04-02 19:53:06.000000000 +0200 @@ -18,7 +18,7 @@ Name: go -Version: 0.0.r60.3+hg20120322 +Version: 1.0 Release: 0 Summary: A compiled, garbage-collected, concurrent programming language License: BSD-3-Clause @@ -36,17 +36,23 @@ Patch1: godoc-path-locations.patch # PATCH-FIX-OPENSUSE add -s flag to 'go install' (don't rebuild/install std libs) Patch3: go-build-dont-reinstall-stdlibs.patch +# PATCH-FIX-OPENSUSE re-enable build binary only packages (we are binary distro) +# see http://code.google.com/p/go/issues/detail?id=2775 & also issue 3268 +Patch4: allow-binary-only-packages.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: ed %if 0%{?suse_version} >= 1210 BuildRequires: systemd %endif -%if 0%{?suse_version} > 1020 BuildRequires: fdupes Recommends: go-doc -%endif -%define goversion weekly.2012-03-22 +# We need to manually specify the release version string here. All code compiled +# with this package will have the release string specified by the VERSION file +# in this source tarball baked into it, libs compiled with a different version +# cannot be linked anyway so all library packages will depend on this version string. +# the version string is pulled into the %godepends macro using the "go version" command. +%define goversion go1 Provides: go = %{goversion} Provides: go-devel = %{goversion} Provides: go-devel-static = %{goversion} @@ -101,6 +107,7 @@ echo %{requiretest} %patch1 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE4} . cp %{SOURCE5} . @@ -186,9 +193,7 @@ # Disable brp-strip-static-archive breaks build %define __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib/rpm/[^/]*/?brp-strip-static-archive %{__strip}!!g') -%if 0%{?suse_version} > 1020 %fdupes %{buildroot}%{_prefix} -%endif %pre %if 0%{?suse_version} >= 1210 @@ -197,17 +202,17 @@ %post %if 0%{?suse_version} >= 1210 -%service_add_pre godoc.service +%service_add_post godoc.service %endif %preun %if 0%{?suse_version} >= 1210 -%service_add_pre godoc.service +%service_del_preun godoc.service %endif %postun %if 0%{?suse_version} >= 1210 -%service_add_pre godoc.service +%service_del_postun godoc.service %endif %files ++++++ VERSION ++++++ --- /var/tmp/diff_new_pack.lHA3P8/_old 2012-04-02 19:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.lHA3P8/_new 2012-04-02 19:53:06.000000000 +0200 @@ -1 +1 @@ -weekly.2012-03-22 +go1 \ No newline at end of file ++++++ allow-binary-only-packages.patch ++++++ diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go index 30bbfad..54d65f9 100644 --- a/src/cmd/go/pkg.go +++ b/src/cmd/go/pkg.go @@ -220,7 +220,7 @@ func loadImport(path string, srcDir string, stk *importStack, importPos []token. // // TODO: After Go 1, decide when to pass build.AllowBinary here. // See issue 3268 for mistakes to avoid. - bp, err := buildContext.Import(path, srcDir, 0) + bp, err := buildContext.Import(path, srcDir, build.AllowBinary) bp.ImportPath = importPath if gobin != "" { bp.BinDir = gobin ++++++ go-0.0.r60.3+hg20120322.tar.bz2 -> go-1.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/go/go-0.0.r60.3+hg20120322.tar.bz2 /work/SRC/openSUSE:Factory/.go.new/go-1.0.tar.bz2 differ: char 11, line 1 ++++++ go-build-dont-reinstall-stdlibs.patch ++++++ --- /var/tmp/diff_new_pack.lHA3P8/_old 2012-04-02 19:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.lHA3P8/_new 2012-04-02 19:53:06.000000000 +0200 @@ -1,8 +1,8 @@ diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go -index 16177c1..5f98a68 100644 +index 4bb83f1..16ce829 100644 --- a/src/cmd/go/build.go +++ b/src/cmd/go/build.go -@@ -89,6 +89,7 @@ func init() { +@@ -91,6 +91,7 @@ func init() { } // Flags set by multiple commands. @@ -10,7 +10,7 @@ var buildA bool // -a flag var buildN bool // -n flag var buildP = runtime.NumCPU() // -p flag -@@ -137,6 +138,10 @@ func init() { +@@ -139,6 +140,10 @@ func init() { // addBuildFlags adds the flags common to the build and install commands. func addBuildFlags(cmd *Command) { // NOTE: If you add flags here, also add them to testflag.go. @@ -21,7 +21,7 @@ cmd.Flag.BoolVar(&buildA, "a", false, "") cmd.Flag.BoolVar(&buildN, "n", false, "") cmd.Flag.IntVar(&buildP, "p", buildP, "") -@@ -760,6 +765,11 @@ func (b *builder) build(a *action) (err error) { +@@ -762,6 +767,11 @@ func (b *builder) build(a *action) (err error) { // install is the action for installing a single package or executable. func (b *builder) install(a *action) (err error) { ++++++ go.sh ++++++ --- /var/tmp/diff_new_pack.lHA3P8/_old 2012-04-02 19:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.lHA3P8/_new 2012-04-02 19:53:06.000000000 +0200 @@ -13,4 +13,5 @@ if [ `id -u` != 0 ]; then export GOPATH=$HOME/go +export GOBIN=$GOPATH/bin fi \ No newline at end of file ++++++ godoc-path-locations.patch ++++++ --- /var/tmp/diff_new_pack.lHA3P8/_old 2012-04-02 19:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.lHA3P8/_new 2012-04-02 19:53:06.000000000 +0200 @@ -1,5 +1,5 @@ diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go -index 26814d2..c645604 100644 +index f6dc678..3579dc7 100644 --- a/src/cmd/godoc/godoc.go +++ b/src/cmd/godoc/godoc.go @@ -81,8 +81,16 @@ var ( ++++++ macros.go ++++++ --- /var/tmp/diff_new_pack.lHA3P8/_old 2012-04-02 19:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.lHA3P8/_new 2012-04-02 19:53:06.000000000 +0200 @@ -1,6 +1,7 @@ # Macros for Go module building. # -# Copyright (c) 2011 Sascha Peilicke <sasc...@gmx.de> +# Copyright: (c) 2011 Sascha Peilicke <sasc...@gmx.de> +# Copyright: (c) 2012 Graham Anderson <gra...@andtech.eu> # %go_ver %(LC_ALL=C rpm -q --qf '%%{epoch}:%%{version}\\n' go | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") @@ -92,6 +93,7 @@ # See: go help install, go help packages %gobuild() \ export BUILDFLAGS="-s -v -p 4" \ +export GOBIN=%{_builddir}/go/bin \ MOD="" \ if [ %# -gt 0 ]; then \ for mod in %*; do \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
