Hello community, here is the log from the commit of package go for openSUSE:Factory checked in at 2012-08-26 11:31:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-12 10:43:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.go.new/go.changes 2012-08-26 11:31:57.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Aug 16 11:15:13 UTC 2012 - [email protected] + +- BNC#776058 +- spec changes, reverse positions of compiled items and package + source in the %install section. touch compiled package archives + after source is installed for go-doc, this prevents the go tool + trying to re-compile/install std libraries. + +------------------------------------------------------------------- +Tue Aug 14 22:31:47 UTC 2012 - [email protected] + +- Patch vim Godoc and Import plugins. +- Update spec file. + - Instead of using tarball generated from a repo checkout, switch + tarball source and use upstream official tarball. + - Remove dependance on VERSION file, make spec more robust for + future updates. + +------------------------------------------------------------------- +Mon Jul 16 23:56:36 UTC 2012 - [email protected] + +- remove unavailable -x verbose flag from go fix macro + +------------------------------------------------------------------- Old: ---- VERSION go-1.0.2.tar.bz2 New: ---- go1.0.2.src.tar.gz opensuse-vim.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go.spec ++++++ --- /var/tmp/diff_new_pack.uJLCAd/_old 2012-08-26 11:31:59.000000000 +0200 +++ /var/tmp/diff_new_pack.uJLCAd/_new 2012-08-26 11:31:59.000000000 +0200 @@ -24,15 +24,12 @@ License: BSD-3-Clause Group: Development/Languages/Other Url: http://golang.org -Source0: go-%{version}.tar.bz2 +Source0: http://go.googlecode.com/files/go%{version}.src.tar.gz Source1: rpmlintrc Source2: go.sh Source3: macros.go -# This file is otherwise generated at build-time from the .hg directory, which was -# stripped from the tarball to save space. TODO: Update contents after version update! -Source4: VERSION -Source5: godoc.service -Source6: README-openSUSE +Source4: godoc.service +Source5: README-openSUSE # PATCH-FIX-OPENSUSE adjust documentation paths for API/doc server Patch1: godoc-path-locations.patch # PATCH-FIX-OPENSUSE add -s flag to 'go install' (don't rebuild/install std libs) @@ -41,6 +38,8 @@ # see http://code.google.com/p/go/issues/detail?id=2775 & also issue 3268 Patch4: allow-binary-only-packages.patch Patch5: verbose-build.patch +# PATCH-FIX-OPENSUSE fix vim Godoc and Import helpers/autocomplete +Patch6: opensuse-vim.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: ed @@ -51,15 +50,9 @@ BuildRequires: fdupes Recommends: go-doc %endif -# 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.0.2 -Provides: go-devel = %{goversion} -Provides: go-devel-static = %{goversion} -Obsoletes: go-devel < %{goversion} +Provides: go-devel = %{name}%{version} +Provides: go-devel-static = %{name}%{version} +Obsoletes: go-devel < %{name}%{version} ExclusiveArch: %ix86 x86_64 %arm # For godoc service %if 0%{?suse_version} >= 1210 @@ -112,9 +105,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 cp %{SOURCE4} . cp %{SOURCE5} . -cp %{SOURCE6} . # setup go_arch (BSD-like scheme) %ifarch %ix86 @@ -166,14 +159,6 @@ mkdir -p %{buildroot}%{_unitdir} install -Dm644 godoc.service %{buildroot}%{_unitdir}/godoc.service -# copy document templates, packages, obj libs and command utilities -mkdir -p %{buildroot}%{_bindir} -mkdir -p $GOROOT/lib -cp -ar lib/godoc $GOROOT/lib -mv pkg $GOROOT -mv bin/* %{buildroot}%{_bindir} -rm -f %{buildroot}%{_bindir}/{hgpatch,quietgcc} - # source files for go install, godoc, etc install -d %{buildroot}%{_datadir}/go for ext in *.{go,c,h,s,S,py}; do @@ -183,6 +168,14 @@ ln -s /usr/share/go/src/pkg $GOROOT/src/pkg ln -s /usr/share/go/src/cmd $GOROOT/src/cmd +# copy document templates, packages, obj libs and command utilities +mkdir -p %{buildroot}%{_bindir} +mkdir -p $GOROOT/lib +cp -ar lib/godoc $GOROOT/lib +mv pkg $GOROOT +mv bin/* %{buildroot}%{_bindir} +rm -f %{buildroot}%{_bindir}/{hgpatch,quietgcc} + # documentation and examples # fix documetation permissions (rpmlint warning) find doc/ misc/ -type f -exec chmod 0644 '{}' \; @@ -219,6 +212,9 @@ %service_add_post godoc.service %endif +%post -n go-doc +find %{_libdir}/go/pkg -type f -exec touch {} + + %preun %if 0%{?suse_version} >= 1210 %service_del_preun godoc.service ++++++ macros.go ++++++ --- /var/tmp/diff_new_pack.uJLCAd/_old 2012-08-26 11:31:59.000000000 +0200 +++ /var/tmp/diff_new_pack.uJLCAd/_new 2012-08-26 11:31:59.000000000 +0200 @@ -21,6 +21,7 @@ Provides: %{name}-devel-static = %{version} %go_disable_brp_strip_static_archive \ +%undefine __os_install_post \ %define __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib/rpm/[^/]*/?brp-strip-static-archive %{__strip}!!g') @@ -134,7 +135,7 @@ echo "gofix: please specify a valid importpath, see: go help fix" \ exit 1 \ else \ - go fix -x %1... \ + go fix %1... \ fi \ %{nil} ++++++ opensuse-vim.patch ++++++ diff --git a/misc/vim/autoload/go/complete.vim b/misc/vim/autoload/go/complete.vim index d4ae3b9..ae554bc 100644 --- a/misc/vim/autoload/go/complete.vim +++ b/misc/vim/autoload/go/complete.vim @@ -29,21 +29,35 @@ if len(s:goarch) == 0 endif function! go#complete#Package(ArgLead, CmdLine, CursorPos) + let dirs = [] + + let workspaces = split( $GOPATH, ':' ) + if workspaces != [] + let dirs += workspaces + endif + let goroot = $GOROOT - if len(goroot) == 0 - " should not occur. - return [] + if len(goroot) != 0 + let dirs += [ goroot ] endif + + if len( dirs ) == 0 + " should not happen + return [] + endif + let ret = {} - let root = expand(goroot.'/pkg/'.s:goos.'_'.s:goarch) - for i in split(globpath(root, a:ArgLead.'*'), "\n") - if isdirectory(i) - let i .= '/' - elseif i !~ '\.a$' - continue - endif - let i = substitute(substitute(i[len(root)+1:], '[\\]', '/', 'g'), '\.a$', '', 'g') - let ret[i] = i + for dir in dirs + let root = expand(dir.'/pkg/'.s:goos.'_'.s:goarch) + for i in split(globpath(root, a:ArgLead.'*'), "\n") + if isdirectory(i) + let i .= '/' + elseif i !~ '\.a$' + continue + endif + let i = substitute(substitute(i[len(root)+1:], '[\\]', '/', 'g'), '\.a$', '', 'g') + let ret[i] = i + endfor endfor return sort(keys(ret)) endfunction diff --git a/misc/vim/plugin/godoc.vim b/misc/vim/plugin/godoc.vim index fdb4966..a43d99d 100644 --- a/misc/vim/plugin/godoc.vim +++ b/misc/vim/plugin/godoc.vim @@ -72,7 +72,7 @@ function! s:Godoc(...) if !len(word) let word = expand('<cword>') endif - let word = substitute(word, '[^a-zA-Z0-9\/]', '', 'g') + let word = substitute(word, '[^a-zA-Z0-9\/.-]', '', 'g') if !len(word) return endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
