The package rpms/golang-googlecode-tools.git has added or updated architecture specific
content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-googlecode-tools.git/commi....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 7dd90e7f6f6ca2368efb5668dd76e03bd9956606
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Apr 4 12:28:52 2018 +0200
Update to go spec 3.0
diff --git a/.gitignore b/.gitignore
index f617860..44823ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/tools-9deed8c.tar.gz
/tools-ce871d1.tar.gz
+/tools-ce871d178848e3eea1e8795e5cfb74053dde4bb9.tar.gz
diff --git a/golang-googlecode-tools.spec b/golang-googlecode-tools.spec
index 0e793f6..ca8260b 100644
--- a/golang-googlecode-tools.spec
+++ b/golang-googlecode-tools.spec
@@ -1,23 +1,21 @@
#
https://github.com/golang/tools
-%global provider_prefix
github.com/golang/tools
-%global gobaseipath
golang.org/x/tools
+%global forgeurl
https://github.com/golang/tools
+%global goipath
golang.org/x/tools
%global commit ce871d178848e3eea1e8795e5cfb74053dde4bb9
-%global commitdate 20180214
-%gocraftmeta -i
+Version: 0
+
+%gometa -i
%global x_name golang-golangorg-tools
%global go_arch %(go env GOHOSTARCH)
%global go_root %(go env GOROOT)
-%global __go_ignore_regex /testdata
-
%global commands benchcmp callgraph digraph eg godex godoc goimports gorename gotype
html2article present ssadump stringer
Name: golang-googlecode-tools
-Version: 0
-Release: 21.1.%{commitdate}git%{shortcommit}%{?dist}
+Release: 22.1%{?dist}
Summary: Supplementary tools and packages for Go
License: BSD
URL: %{gourl}
@@ -28,7 +26,7 @@ Source0: %{gosource}
%package -n golang-godoc
Summary: Documentation tool for the Go programming language
-Provides: golang(%{gobaseipath}/cmd/godoc) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/godoc) = %{version}-%{release}
Epoch: 1
%description -n golang-godoc
@@ -37,7 +35,7 @@ Obsoletes: golang-godoc = 1.1.2
%package -n golang-gotype
Summary: Go programming language source code analysis tool
-Provides: golang(%{gobaseipath}/cmd/gotype) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/gotype) = %{version}-%{release}
%description -n golang-gotype
The gotype command does syntactic and semantic analysis of Go files and
@@ -47,7 +45,7 @@ analysis fails; otherwise gotype is quiet.
%package -n golang-html2article
Summary: Tool for creating articles from HTML files
-Provides: golang(%{gobaseipath}/cmd/html2article) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/html2article) = %{version}-%{release}
BuildRequires:
golang(golang.org/x/net/html)
BuildRequires:
golang(golang.org/x/net/html/atom)
@@ -57,35 +55,35 @@ in present format. See:
code.google.com/p/go.tools/present
%package callgraph
Summary: Tool for reporting the call graph of a Go program
-Provides: golang(%{gobaseipath}/cmd/callgraph) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/callgraph) = %{version}-%{release}
%description callgraph
Tool for reporting the call graph of a Go program.
%package digraph
Summary: Tool performs queries over unlabelled directed graphs represented in text
form
-Provides: golang(%{gobaseipath}/cmd/digraph) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/digraph) = %{version}-%{release}
%description digraph
The digraph command performs queries over unlabelled directed graphs represented in text
form.
%package gorename
Summary: Tool for reporting the call graph of a Go program
-Provides: golang(%{gobaseipath}/cmd/gorename) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/gorename) = %{version}-%{release}
%description gorename
Tool for reporting the call graph of a Go program.
%package stringer
Summary: Tool to automate the creation of methods that satisfy the fmt.Stringer
interface
-Provides: golang(%{gobaseipath}/cmd/stringer) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/stringer) = %{version}-%{release}
%description stringer
tool to automate the creation of methods that satisfy the fmt.Stringer interface.
%package godex
Summary: Dump exported information for Go programming language
-Provides: golang(%{gobaseipath}/cmd/godex) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/godex) = %{version}-%{release}
%description godex
%{summary}.
@@ -95,7 +93,7 @@ See
http://godoc.org/code.google.com/p/go.tools/cmd/godex for more
information.
%package benchcmp
Summary: Displays performance changes between benchmarks for the Go programming
language
-Provides: golang(%{gobaseipath}/cmd/benchcmp) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/benchcmp) = %{version}-%{release}
%description benchcmp
%{summary}.
@@ -105,7 +103,7 @@ See
http://godoc.org/code.google.com/p/go.tools/cmd/benchcmp for more
informatio
%package eg
Summary: Example-based refactoring for the Go programming language
-Provides: golang(%{gobaseipath}/cmd/eg) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/eg) = %{version}-%{release}
%description eg
%{summary}.
@@ -115,7 +113,7 @@ See `eg -help` for more information.
%package goimports
Summary: Go programming language import line formatter
-Provides: golang(%{gobaseipath}/cmd/goimports) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/goimports) = %{version}-%{release}
%description goimports
%{summary}.
@@ -125,7 +123,7 @@ See
http://godoc.org/code.google.com/p/go.tools/cmd/goimports for more
informati
%package present
Summary: Slide and Article Presentation
-Provides: golang(%{gobaseipath}/cmd/present) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/present) = %{version}-%{release}
%description present
%{summary}.
@@ -135,7 +133,7 @@ See
http://godoc.org/code.google.com/p/go.tools/cmd/present for more
information
%package ssadump
Summary: Display and interpreting SSA form of Go programs
-Provides: golang(%{gobaseipath}/cmd/ssadump) = %{version}-%{release}
+Provides: golang(%{goipath}/cmd/ssadump) = %{version}-%{release}
%description ssadump
%{summary}.
@@ -152,12 +150,12 @@ This package contains library source intended for building other
packages
which use the supplementary Go tools libraries with
golang.org/x/ imports.
%prep
-%gosetup
+%gosetup -q
%build
%gobuildroot
for cmd in %commands; do
- %gobuild -o _bin/$cmd %{gobaseipath}/cmd/$cmd
+ %gobuild -o _bin/$cmd %{goipath}/cmd/$cmd
done
%install
@@ -167,13 +165,11 @@ for cmd in %commands; do
done
# source codes for building projects
-%goinstall $(find . -name "testdata" -type d)
+files="$(find . -name 'testdata' -type d)"
+%goinstall $files
%check
-%gochecks %{gobaseipath}/go/gcimporter15
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
+%gochecks -d go/gcimporter15
%files -n golang-godoc
%{_bindir}/godoc
@@ -215,10 +211,13 @@ done
%{_bindir}/ssadump
%files -n %{x_name}-devel -f devel.file-list
-%license LICENSE
-%doc AUTHORS CONTRIBUTORS PATENTS README.md
+%license LICENSE PATENTS
+%doc AUTHORS CONTRIBUTORS README.md
%changelog
+* Wed Apr 04 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-22.1.gitce871d1
+- Update to go spec 3.0
+
* Mon Feb 19 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-21.1.20180214gitce871d1
- Autogenerate some parts using the new macros
diff --git a/sources b/sources
index 7356de3..76fbcc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tools-ce871d1.tar.gz) =
7edc274a0ad94034c99a343ad45601c78fd243a100e2f62fb82b533d775d8dc6061a7c2a57998951d47b0115a1447703554dda971ab3faea97191183050aed7b
+SHA512 (tools-ce871d178848e3eea1e8795e5cfb74053dde4bb9.tar.gz) =
7edc274a0ad94034c99a343ad45601c78fd243a100e2f62fb82b533d775d8dc6061a7c2a57998951d47b0115a1447703554dda971ab3faea97191183050aed7b
commit ccdaf1195b539315a399513bff10d4a0789eb9ed
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Sat Feb 24 17:48:21 2018 +0100
Make the devel rpm arch specific
diff --git a/golang-googlecode-tools.spec b/golang-googlecode-tools.spec
index 9cbfea1..0e793f6 100644
--- a/golang-googlecode-tools.spec
+++ b/golang-googlecode-tools.spec
@@ -142,7 +142,6 @@ Provides: golang(%{gobaseipath}/cmd/ssadump) =
%{version}-%{release}
%package -n %{x_name}-devel
Summary: Libraries of supplementary Go tools
-BuildArch: noarch
BuildRequires: golang-docs
@@ -168,15 +167,10 @@ for cmd in %commands; do
done
# source codes for building projects
-%goinstall $(find . -name "testdata" -type d | egrep -v
"gccgoexportdata|gcimporter15|gcexportdata|gccgoimporter")
-# The following dirs contains arch-specific binaries
-#gccgoexportdata/testdata
-#gcimporter15/testdata
-#gcexportdata/testdata
-#gcimporter/testdata
+%goinstall $(find . -name "testdata" -type d)
%check
-%gochecks
%{gobaseipath}/{go/gcimporter15,go/gccgoexportdata,go/gcexportdata,go/internal/gccgoimporter}
+%gochecks %{gobaseipath}/go/gcimporter15
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
commit bb04833e87313514b5daca976efebecccbd0cbcc
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Feb 19 01:30:35 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-googlecode-tools.spec b/golang-googlecode-tools.spec
index fdceccd..9cbfea1 100644
--- a/golang-googlecode-tools.spec
+++ b/golang-googlecode-tools.spec
@@ -1,79 +1,44 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0
condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply
a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-# tests requires golang-docs which is not present on gcc-go archs
-%ifarch %{?golang_arches:%{golang_arches}}%{!?golang_arches:%{ix86} x86_64 aarch64
%{arm}}
-%global with_check 1
-# Generate unit-test rpm
-%global with_unit_test 1
-%else
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%global debug_package %{nil}
-%global provider github
-%global provider_tld com
-%global project golang
-%global repo tools
-#
https://github.com/golang/tools/
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path
golang.org/x/tools
+#
https://github.com/golang/tools
+%global provider_prefix
github.com/golang/tools
+%global gobaseipath
golang.org/x/tools
%global commit ce871d178848e3eea1e8795e5cfb74053dde4bb9
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commitdate 20180214
-%global gc_import_path
code.google.com/p/go.tools
+%gocraftmeta -i
+
%global x_name golang-golangorg-tools
%global go_arch %(go env GOHOSTARCH)
%global go_root %(go env GOROOT)
+%global __go_ignore_regex /testdata
+
+%global commands benchcmp callgraph digraph eg godex godoc goimports gorename gotype
html2article present ssadump stringer
+
Name: golang-googlecode-tools
Version: 0
-Release: 20.1.%{commitdate}git%{shortcommit}%{?dist}
+Release: 21.1.%{commitdate}git%{shortcommit}%{?dist}
Summary: Supplementary tools and packages for Go
License: BSD
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
%package -n golang-godoc
Summary: Documentation tool for the Go programming language
-Provides: golang(%{gc_import_path}/cmd/godoc) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/godoc) = %{version}-%{release}
Epoch: 1
+
%description -n golang-godoc
Godoc extracts and generates documentation for Go programs.
Obsoletes: golang-godoc = 1.1.2
%package -n golang-gotype
Summary: Go programming language source code analysis tool
-Provides: golang(%{gc_import_path}/cmd/gotype) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/gotype) = %{version}-%{release}
+
%description -n golang-gotype
The gotype command does syntactic and semantic analysis of Go files and
packages like the front-end of a Go compiler. Errors are reported if the
@@ -82,40 +47,46 @@ analysis fails; otherwise gotype is quiet.
%package -n golang-html2article
Summary: Tool for creating articles from HTML files
-Provides: golang(%{gc_import_path}/cmd/html2article) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/html2article) = %{version}-%{release}
BuildRequires:
golang(golang.org/x/net/html)
BuildRequires:
golang(golang.org/x/net/html/atom)
+
%description -n golang-html2article
This program takes an HTML file and outputs a corresponding article file
in present format. See:
code.google.com/p/go.tools/present
%package callgraph
Summary: Tool for reporting the call graph of a Go program
-Provides: golang(%{gc_import_path}/cmd/callgraph) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/callgraph) = %{version}-%{release}
+
%description callgraph
Tool for reporting the call graph of a Go program.
%package digraph
Summary: Tool performs queries over unlabelled directed graphs represented in text
form
-Provides: golang(%{gc_import_path}/cmd/digraph) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/digraph) = %{version}-%{release}
+
%description digraph
The digraph command performs queries over unlabelled directed graphs represented in text
form.
%package gorename
Summary: Tool for reporting the call graph of a Go program
-Provides: golang(%{gc_import_path}/cmd/gorename) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/gorename) = %{version}-%{release}
+
%description gorename
Tool for reporting the call graph of a Go program.
%package stringer
Summary: Tool to automate the creation of methods that satisfy the fmt.Stringer
interface
-Provides: golang(%{gc_import_path}/cmd/stringer) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/stringer) = %{version}-%{release}
+
%description stringer
tool to automate the creation of methods that satisfy the fmt.Stringer interface.
%package godex
Summary: Dump exported information for Go programming language
-Provides: golang(%{gc_import_path}/cmd/godex) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/godex) = %{version}-%{release}
+
%description godex
%{summary}.
@@ -124,7 +95,8 @@ See
http://godoc.org/code.google.com/p/go.tools/cmd/godex for more
information.
%package benchcmp
Summary: Displays performance changes between benchmarks for the Go programming
language
-Provides: golang(%{gc_import_path}/cmd/benchcmp) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/benchcmp) = %{version}-%{release}
+
%description benchcmp
%{summary}.
@@ -133,7 +105,8 @@ See
http://godoc.org/code.google.com/p/go.tools/cmd/benchcmp for more
informatio
%package eg
Summary: Example-based refactoring for the Go programming language
-Provides: golang(%{gc_import_path}/cmd/eg) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/eg) = %{version}-%{release}
+
%description eg
%{summary}.
@@ -142,7 +115,8 @@ See `eg -help` for more information.
%package goimports
Summary: Go programming language import line formatter
-Provides: golang(%{gc_import_path}/cmd/goimports) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/goimports) = %{version}-%{release}
+
%description goimports
%{summary}.
@@ -151,7 +125,8 @@ See
http://godoc.org/code.google.com/p/go.tools/cmd/goimports for more
informati
%package present
Summary: Slide and Article Presentation
-Provides: golang(%{gc_import_path}/cmd/present) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/present) = %{version}-%{release}
+
%description present
%{summary}.
@@ -160,107 +135,16 @@ See
http://godoc.org/code.google.com/p/go.tools/cmd/present for
more information
%package ssadump
Summary: Display and interpreting SSA form of Go programs
-Provides: golang(%{gc_import_path}/cmd/ssadump) = %{version}-%{release}
+Provides: golang(%{gobaseipath}/cmd/ssadump) = %{version}-%{release}
+
%description ssadump
%{summary}.
-%package devel
-Summary: Libraries of supplementary Go tools
-BuildArch: noarch
-
-Provides: golang(%{gc_import_path}/benchmark/parse) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/blog) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/blog/atom) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/cmd/guru/serial) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/container/intsets) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/cover) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/ast/astutil) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/buildutil) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/callgraph) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/callgraph/cha) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/callgraph/rta) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/callgraph/static) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/gcimporter15) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/loader) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/pointer) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/ssa) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/ssa/interp) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/ssa/ssautil) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/types/typeutil) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/go/vcs) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/analysis) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/dl) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/proxy) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/redirect) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/short) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/static) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/util) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/vfs) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/vfs/gatefs) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/vfs/httpfs) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/vfs/mapfs) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/godoc/vfs/zipfs) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/imports) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/playground) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/playground/socket) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/present) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/refactor/eg) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/refactor/importgraph) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/refactor/rename) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/refactor/satisfy) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for building other packages
-which use the supplementary Go tools libraries with
code.google.com/p/ imports.
-
%package -n %{x_name}-devel
Summary: Libraries of supplementary Go tools
BuildArch: noarch
-Provides: golang(%{import_path}/benchmark/parse) = %{version}-%{release}
-Provides: golang(%{import_path}/blog) = %{version}-%{release}
-Provides: golang(%{import_path}/blog/atom) = %{version}-%{release}
-Provides: golang(%{import_path}/cmd/guru/serial) = %{version}-%{release}
-Provides: golang(%{import_path}/container/intsets) = %{version}-%{release}
-Provides: golang(%{import_path}/cover) = %{version}-%{release}
-Provides: golang(%{import_path}/go/ast/astutil) = %{version}-%{release}
-Provides: golang(%{import_path}/go/buildutil) = %{version}-%{release}
-Provides: golang(%{import_path}/go/callgraph) = %{version}-%{release}
-Provides: golang(%{import_path}/go/callgraph/cha) = %{version}-%{release}
-Provides: golang(%{import_path}/go/callgraph/rta) = %{version}-%{release}
-Provides: golang(%{import_path}/go/callgraph/static) = %{version}-%{release}
-Provides: golang(%{import_path}/go/gcimporter15) = %{version}-%{release}
-Provides: golang(%{import_path}/go/loader) = %{version}-%{release}
-Provides: golang(%{import_path}/go/pointer) = %{version}-%{release}
-Provides: golang(%{import_path}/go/ssa) = %{version}-%{release}
-Provides: golang(%{import_path}/go/ssa/interp) = %{version}-%{release}
-Provides: golang(%{import_path}/go/ssa/ssautil) = %{version}-%{release}
-Provides: golang(%{import_path}/go/types/typeutil) = %{version}-%{release}
-Provides: golang(%{import_path}/go/vcs) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/analysis) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/dl) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/proxy) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/redirect) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/short) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/static) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/util) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/vfs) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/vfs/gatefs) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/vfs/httpfs) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/vfs/mapfs) = %{version}-%{release}
-Provides: golang(%{import_path}/godoc/vfs/zipfs) = %{version}-%{release}
-Provides: golang(%{import_path}/imports) = %{version}-%{release}
-Provides: golang(%{import_path}/playground) = %{version}-%{release}
-Provides: golang(%{import_path}/playground/socket) = %{version}-%{release}
-Provides: golang(%{import_path}/present) = %{version}-%{release}
-Provides: golang(%{import_path}/refactor/eg) = %{version}-%{release}
-Provides: golang(%{import_path}/refactor/importgraph) = %{version}-%{release}
-Provides: golang(%{import_path}/refactor/rename) = %{version}-%{release}
-Provides: golang(%{import_path}/refactor/satisfy) = %{version}-%{release}
+BuildRequires: golang-docs
%description -n %{x_name}-devel
%{summary}
@@ -268,192 +152,31 @@ Provides: golang(%{import_path}/refactor/satisfy) =
%{version}-%{release}
This package contains library source intended for building other packages
which use the supplementary Go tools libraries with
golang.org/x/ imports.
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package -n %{x_name}-unit-test-devel
-Summary: Unit tests for %{name} package
-
-%if 0%{?with_check}
-BuildRequires: golang-docs
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{x_name}-devel = %{version}-%{release}
-Requires: golang-docs
-
-%description -n %{x_name}-unit-test-devel
-%{summary}
-
-This package contains unit tests for %{project}/%{repo}.
-%endif
-
%prep
-%setup -q -n %{repo}-%{commit}
-#%patch0 -p1
+%gosetup
%build
-#
code.google.com/p/goauth2/oauth, oauth package has been moved to root directory
-# but does not contain CacheFile symbol anymore
-rm -rf dashboard/coordinator
-
-mkdir _build
-pushd _build
-
-mkdir -p src/$(dirname %{import_path})
-ln -s $(dirs +1 -l) src/%{import_path}
-export GOPATH=$(pwd):%{gopath}
-for cmd in \
- benchcmp \
- callgraph \
- digraph \
- eg \
- godex \
- godoc \
- goimports \
- gorename \
- gotype \
- html2article \
- present \
- ssadump \
- stringer
-do
- go build -v -a %{import_path}/cmd/$cmd
- # skip building in order to test tests
- #cp /usr/bin/true $cmd
+%gobuildroot
+for cmd in %commands; do
+ %gobuild -o _bin/$cmd %{gobaseipath}/cmd/$cmd
done
-popd
-
%install
install -d %{buildroot}%{_bindir}
-install -p -m 755 _build/benchcmp %{buildroot}%{_bindir}
-install -p -m 755 _build/callgraph %{buildroot}%{_bindir}
-install -p -m 755 _build/digraph %{buildroot}%{_bindir}
-install -p -m 755 _build/eg %{buildroot}%{_bindir}
-install -p -m 755 _build/godex %{buildroot}%{_bindir}
-install -p -m 755 _build/godoc %{buildroot}%{_bindir}
-install -p -m 755 _build/goimports %{buildroot}%{_bindir}
-install -p -m 755 _build/gorename %{buildroot}%{_bindir}
-install -p -m 755 _build/gotype %{buildroot}%{_bindir}
-install -p -m 755 _build/html2article %{buildroot}%{_bindir}
-install -p -m 755 _build/present %{buildroot}%{_bindir}
-install -p -m 755 _build/ssadump %{buildroot}%{_bindir}
-install -p -m 755 _build/stringer %{buildroot}%{_bindir}
-
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-install -d -p %{buildroot}/%{gopath}/src/%{gc_import_path}/
-
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> x_devel.file-list
-echo "%%dir %%{gopath}/src/%%{gc_import_path}/." >> gc_devel.file-list
-
-# find all *.go but no *_test.go files and generate devel.file-list
-for ext in go s; do
- for file in $(find . -iname "*.${ext}" \! -iname "*_test.go") ;
do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> x_devel.file-list
-
- install -d -p %{buildroot}/%{gopath}/src/%{gc_import_path}/$(dirname $file)
- cp $file %{buildroot}/%{gopath}/src/%{gc_import_path}/$file
- echo "%%{gopath}/src/%%{gc_import_path}/$file" >>
gc_devel.file-list
- done
+for cmd in %commands; do
+ install -p -m 755 _bin/$cmd %{buildroot}%{_bindir}
done
-cp -r cmd/present/static %{buildroot}/%{gopath}/src/%{import_path}/cmd/present/.
-echo "%%{gopath}/src/%%{import_path}/cmd/present/static" >>
x_devel.file-list
-cp -r cmd/present/templates %{buildroot}/%{gopath}/src/%{import_path}/cmd/present/.
-echo "%%{gopath}/src/%%{import_path}/cmd/present/templates" >>
x_devel.file-list
-
-cp -r cmd/present/static %{buildroot}/%{gopath}/src/%{gc_import_path}/cmd/present/.
-echo "%%{gopath}/src/%%{gc_import_path}/cmd/present/static" >>
gc_devel.file-list
-cp -r cmd/present/templates %{buildroot}/%{gopath}/src/%{gc_import_path}/cmd/present/.
-echo "%%{gopath}/src/%%{gc_import_path}/cmd/present/templates" >>
gc_devel.file-list
-
-pushd %{buildroot}/%{gopath}/src/%{gc_import_path}/
-sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \
- $(find . -name '*.go')
-popd
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >>
x_devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >>
unit-test-devel.file-list
-done
-
-for dir in $(find . -iname testdata); do
- mkdir -p %{buildroot}/%{gopath}/src/%{import_path}/$dir
- cp -r $dir/* %{buildroot}/%{gopath}/src/%{import_path}/$dir/.
- echo "%%{gopath}/src/%%{import_path}/$dir" >> unit-test-devel.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o x_devel.file-list x_devel.file-list
-sort -u -o gc_devel.file-list gc_devel.file-list
-%endif
+# source codes for building projects
+%goinstall $(find . -name "testdata" -type d | egrep -v
"gccgoexportdata|gcimporter15|gcexportdata|gccgoimporter")
+# The following dirs contains arch-specific binaries
+#gccgoexportdata/testdata
+#gcimporter15/testdata
+#gcexportdata/testdata
+#gcimporter/testdata
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}:/usr/include:/usr/lib64
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}/benchmark/parse
-%gotest %{import_path}/cmd/benchcmp
-%gotest %{import_path}/cmd/bundle
-%gotest %{import_path}/cmd/callgraph
-%gotest %{import_path}/cmd/cover
-%gotest %{import_path}/cmd/digraph
-%gotest %{import_path}/cmd/fiximports
-%gotest %{import_path}/cmd/getgo
-%gotest %{import_path}/cmd/go-contrib-init
-#%%gotest %%{import_path}/cmd/godoc
-%gotest %{import_path}/cmd/gorename
-%gotest %{import_path}/cmd/guru
-%gotest %{import_path}/cmd/stringer
-%gotest %{import_path}/cmd/tip
-%gotest %{import_path}/container/intsets
-%gotest %{import_path}/go/ast/astutil
-%gotest %{import_path}/go/buildutil
-%gotest %{import_path}/go/callgraph/cha
-%gotest %{import_path}/go/callgraph/rta
-%gotest %{import_path}/go/callgraph/static
-#%%gotest %%{import_path}/go/gcimporter15
-%gotest %{import_path}/go/internal/gccgoimporter
-#%%gotest %%{import_path}/go/loader
-%gotest %{import_path}/go/pointer
-%gotest %{import_path}/go/ssa
-#%%gotest %%{import_path}/go/ssa/interp
-%gotest %{import_path}/go/ssa/ssautil
-%gotest %{import_path}/go/types/typeutil
-%gotest %{import_path}/go/vcs
-%gotest %{import_path}/godoc
-#%%gotest %%{import_path}/godoc/dl
-%gotest %{import_path}/godoc/redirect
-%gotest %{import_path}/godoc/vfs
-%gotest %{import_path}/godoc/vfs/mapfs
-%gotest %{import_path}/godoc/vfs/zipfs
-%gotest %{import_path}/imports
-%gotest %{import_path}/playground/socket
-%gotest %{import_path}/present
-%gotest %{import_path}/refactor/eg
-#%%gotest %%{import_path}/refactor/importgraph
-%gotest %{import_path}/refactor/rename
-
-%endif
+%gochecks
%{gobaseipath}/{go/gcimporter15,go/gccgoexportdata,go/gcexportdata,go/internal/gccgoimporter}
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
@@ -497,22 +220,14 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}:/usr/inc
%files ssadump
%{_bindir}/ssadump
-%if 0%{?with_devel}
-%files devel -f gc_devel.file-list
+%files -n %{x_name}-devel -f devel.file-list
%license LICENSE
%doc AUTHORS CONTRIBUTORS PATENTS README.md
-%files -n %{x_name}-devel -f x_devel.file-list
-%license LICENSE
-%doc AUTHORS CONTRIBUTORS PATENTS README.md
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files -n %{x_name}-unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%endif
-
%changelog
+* Mon Feb 19 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-21.1.20180214gitce871d1
+- Autogenerate some parts using the new macros
+
* Thu Feb 15 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-20.1.20180214gitce871d1
- Bump to upstream ce871d178848e3eea1e8795e5cfb74053dde4bb9
commit 559bb88058175a50767ecdfeac292587235daad5
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu Feb 15 19:11:08 2018 +0100
Bump to upstream ce871d178848e3eea1e8795e5cfb74053dde4bb9
diff --git a/.gitignore b/.gitignore
index a99a932..f617860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/tools-9deed8c.tar.gz
+/tools-ce871d1.tar.gz
diff --git a/golang-googlecode-tools.spec b/golang-googlecode-tools.spec
index f40376f..fdceccd 100644
--- a/golang-googlecode-tools.spec
+++ b/golang-googlecode-tools.spec
@@ -37,8 +37,9 @@
#
https://github.com/golang/tools/
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path
golang.org/x/tools
-%global commit 9deed8c6c1c89e0b6d68d727f215de8e851d1064
+%global commit ce871d178848e3eea1e8795e5cfb74053dde4bb9
%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20180214
%global gc_import_path
code.google.com/p/go.tools
%global x_name golang-golangorg-tools
@@ -48,7 +49,7 @@
Name: golang-googlecode-tools
Version: 0
-Release: 19.1.git%{shortcommit}%{?dist}
+Release: 20.1.%{commitdate}git%{shortcommit}%{?dist}
Summary: Supplementary tools and packages for Go
License: BSD
URL: https://%{provider_prefix}
@@ -139,15 +140,6 @@ Provides: golang(%{gc_import_path}/cmd/eg) =
%{version}-%{release}
See `eg -help` for more information.
-%package oracle
-Summary: Go programming language oracle
-Provides: golang(%{gc_import_path}/cmd/oracle) = %{version}-%{release}
-%description oracle
-%{summary}.
-
-See
http://golang.org/s/oracle-user-manual for more information.
-
-
%package goimports
Summary: Go programming language import line formatter
Provides: golang(%{gc_import_path}/cmd/goimports) = %{version}-%{release}
@@ -210,8 +202,6 @@ Provides: golang(%{gc_import_path}/godoc/vfs/httpfs) =
%{version}-%{releas
Provides: golang(%{gc_import_path}/godoc/vfs/mapfs) = %{version}-%{release}
Provides: golang(%{gc_import_path}/godoc/vfs/zipfs) = %{version}-%{release}
Provides: golang(%{gc_import_path}/imports) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/oracle) = %{version}-%{release}
-Provides: golang(%{gc_import_path}/oracle/serial) = %{version}-%{release}
Provides: golang(%{gc_import_path}/playground) = %{version}-%{release}
Provides: golang(%{gc_import_path}/playground/socket) = %{version}-%{release}
Provides: golang(%{gc_import_path}/present) = %{version}-%{release}
@@ -264,8 +254,6 @@ Provides: golang(%{import_path}/godoc/vfs/httpfs) =
%{version}-%{release}
Provides: golang(%{import_path}/godoc/vfs/mapfs) = %{version}-%{release}
Provides: golang(%{import_path}/godoc/vfs/zipfs) = %{version}-%{release}
Provides: golang(%{import_path}/imports) = %{version}-%{release}
-Provides: golang(%{import_path}/oracle) = %{version}-%{release}
-Provides: golang(%{import_path}/oracle/serial) = %{version}-%{release}
Provides: golang(%{import_path}/playground) = %{version}-%{release}
Provides: golang(%{import_path}/playground/socket) = %{version}-%{release}
Provides: golang(%{import_path}/present) = %{version}-%{release}
@@ -324,7 +312,6 @@ for cmd in \
gorename \
gotype \
html2article \
- oracle \
present \
ssadump \
stringer
@@ -348,7 +335,6 @@ install -p -m 755 _build/goimports %{buildroot}%{_bindir}
install -p -m 755 _build/gorename %{buildroot}%{_bindir}
install -p -m 755 _build/gotype %{buildroot}%{_bindir}
install -p -m 755 _build/html2article %{buildroot}%{_bindir}
-install -p -m 755 _build/oracle %{buildroot}%{_bindir}
install -p -m 755 _build/present %{buildroot}%{_bindir}
install -p -m 755 _build/ssadump %{buildroot}%{_bindir}
install -p -m 755 _build/stringer %{buildroot}%{_bindir}
@@ -432,35 +418,39 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}:/usr/inc
%gotest %{import_path}/cmd/cover
%gotest %{import_path}/cmd/digraph
%gotest %{import_path}/cmd/fiximports
-#%gotest %{import_path}/cmd/godoc
+%gotest %{import_path}/cmd/getgo
+%gotest %{import_path}/cmd/go-contrib-init
+#%%gotest %%{import_path}/cmd/godoc
+%gotest %{import_path}/cmd/gorename
%gotest %{import_path}/cmd/guru
%gotest %{import_path}/cmd/stringer
+%gotest %{import_path}/cmd/tip
%gotest %{import_path}/container/intsets
%gotest %{import_path}/go/ast/astutil
%gotest %{import_path}/go/buildutil
%gotest %{import_path}/go/callgraph/cha
%gotest %{import_path}/go/callgraph/rta
%gotest %{import_path}/go/callgraph/static
-#%gotest %{import_path}/go/gcimporter15
-#%gotest %{import_path}/go/loader
+#%%gotest %%{import_path}/go/gcimporter15
+%gotest %{import_path}/go/internal/gccgoimporter
+#%%gotest %%{import_path}/go/loader
%gotest %{import_path}/go/pointer
%gotest %{import_path}/go/ssa
-#%gotest %{import_path}/go/ssa/interp
+#%%gotest %%{import_path}/go/ssa/interp
%gotest %{import_path}/go/ssa/ssautil
%gotest %{import_path}/go/types/typeutil
%gotest %{import_path}/go/vcs
%gotest %{import_path}/godoc
-#%gotest %{import_path}/godoc/dl
+#%%gotest %%{import_path}/godoc/dl
%gotest %{import_path}/godoc/redirect
%gotest %{import_path}/godoc/vfs
%gotest %{import_path}/godoc/vfs/mapfs
%gotest %{import_path}/godoc/vfs/zipfs
%gotest %{import_path}/imports
-%gotest %{import_path}/oracle
%gotest %{import_path}/playground/socket
%gotest %{import_path}/present
%gotest %{import_path}/refactor/eg
-#%gotest %{import_path}/refactor/importgraph
+#%%gotest %%{import_path}/refactor/importgraph
%gotest %{import_path}/refactor/rename
%endif
@@ -469,69 +459,52 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}:/usr/inc
%{!?_licensedir:%global license %doc}
%files -n golang-godoc
-%defattr(-,root,root,-)
%{_bindir}/godoc
%files -n golang-gotype
-%defattr(-,root,root,-)
%{_bindir}/gotype
%files -n golang-html2article
-%defattr(-,root,root,-)
%{_bindir}/html2article
%files godex
-%defattr(-,root,root,-)
%{_bindir}/godex
%files callgraph
-%defattr(-,root,root,-)
%{_bindir}/callgraph
%files digraph
-%defattr(-,root,root,-)
%{_bindir}/digraph
%files gorename
-%defattr(-,root,root,-)
%{_bindir}/gorename
%files stringer
-%defattr(-,root,root,-)
%{_bindir}/stringer
%files eg
-%defattr(-,root,root,-)
%{_bindir}/eg
%files benchcmp
-%defattr(-,root,root,-)
%{_bindir}/benchcmp
-%files oracle
-%defattr(-,root,root,-)
-%{_bindir}/oracle
-
%files goimports
-%defattr(-,root,root,-)
%{_bindir}/goimports
%files present
-%defattr(-,root,root,-)
%{_bindir}/present
%files ssadump
-%defattr(-,root,root,-)
%{_bindir}/ssadump
%if 0%{?with_devel}
%files devel -f gc_devel.file-list
%license LICENSE
-%doc AUTHORS CONTRIBUTORS PATENTS README
+%doc AUTHORS CONTRIBUTORS PATENTS README.md
%files -n %{x_name}-devel -f x_devel.file-list
%license LICENSE
-%doc AUTHORS CONTRIBUTORS PATENTS README
+%doc AUTHORS CONTRIBUTORS PATENTS README.md
%endif
%if 0%{?with_unit_test} && 0%{?with_devel}
@@ -540,6 +513,9 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}:/usr/inc
%endif
%changelog
+* Thu Feb 15 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-20.1.20180214gitce871d1
+- Bump to upstream ce871d178848e3eea1e8795e5cfb74053dde4bb9
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-19.1.git9deed8c
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index a68ec0f..7356de3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-262c2cb0bb56551490d4fd4006dd45d2 tools-9deed8c.tar.gz
+SHA512 (tools-ce871d1.tar.gz) =
7edc274a0ad94034c99a343ad45601c78fd243a100e2f62fb82b533d775d8dc6061a7c2a57998951d47b0115a1447703554dda971ab3faea97191183050aed7b
commit 882cf51110205163d92d2878e590a34c77ac2803
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 15:06:41 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/golang-googlecode-tools.spec b/golang-googlecode-tools.spec
index bf36289..f40376f 100644
--- a/golang-googlecode-tools.spec
+++ b/golang-googlecode-tools.spec
@@ -48,7 +48,7 @@
Name: golang-googlecode-tools
Version: 0
-Release: 18.1.git%{shortcommit}%{?dist}
+Release: 19.1.git%{shortcommit}%{?dist}
Summary: Supplementary tools and packages for Go
License: BSD
URL: https://%{provider_prefix}
@@ -540,6 +540,9 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}:/usr/inc
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-19.1.git9deed8c
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-18.1.git9deed8c
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild