From 1772679cac1970d91c919d5b3c45de6b98bfe629 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Mar 06 2015 19:00:15 +0000 Subject: Bump to a7e14835e46bb13da10fa8b9c9c5e7f2f378f568 Add new tools presented in the commit Change import paths to new prefix schema golang.org/x/... Add new subpackage and keep the only one for back-compatibility - resolves: #1199617 --- diff --git a/.gitignore b/.gitignore index 3f0d4a8..98fb430 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/17c8fe23290ad2f8aab00230300e0d0075ba659c.zip -/d32b5854c9414bdc0767ff71709536a0922fe8b3.zip +/a7e14835e46bb13da10fa8b9c9c5e7f2f378f568.tar.gz diff --git a/golang-googlecode-tools.spec b/golang-googlecode-tools.spec index ddbfd76..7399c3f 100644 --- a/golang-googlecode-tools.spec +++ b/golang-googlecode-tools.spec @@ -1,20 +1,31 @@ %global debug_package %{nil} +%global provider_tld com +%global provider_sub code +%global provider google +%global project p +%global repo go.tools + %global import_path code.google.com/p/go.tools -%global gopath %{_datadir}/gocode -%global rev d32b5854c9414bdc0767ff71709536a0922fe8b3 +%global rev a7e14835e46bb13da10fa8b9c9c5e7f2f378f568 %global shortrev %(r=%{rev}; echo ${r:0:12}) +%global x_provider golang +%global x_provider_tld org +%global x_repo tools +%global x_import_path %{x_provider}.%{x_provider_tld}/x/%{x_repo} +%global x_name golang-%{x_provider}%{x_provider_tld}-tools + %global go_arch %(go env GOHOSTARCH) %global go_root %(go env GOROOT) Name: golang-googlecode-tools Version: 0 -Release: 1.0.hg%{shortrev}%{?dist} +Release: 2.0.hg%{shortrev}%{?dist} Summary: Supplementary tools and packages for Go License: BSD URL: http://%{import_path} -Source0: https://tools.go.googlecode.com/archive/%{rev}.zip -BuildRequires: golang +Source0: https://tools.go.googlecode.com/archive/%{rev}.tar.gz +BuildRequires: golang >= 1.2.1-3 %description %{summary} @@ -64,12 +75,39 @@ analysis fails; otherwise gotype is quiet. Summary: Tool for creating articles from HTML files ExclusiveArch: %{ix86} x86_64 %{arm} Provides: golang(%{import_path}/cmd/html2article) = %{version}-%{release} -BuildRequires: golang(code.google.com/p/go.net/html) -BuildRequires: golang(code.google.com/p/go.net/html/atom) +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 +ExclusiveArch: %{ix86} x86_64 %{arm} +Provides: golang(%{import_path}/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 +ExclusiveArch: %{ix86} x86_64 %{arm} +Provides: golang(%{import_path}/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 +ExclusiveArch: %{ix86} x86_64 %{arm} +Provides: golang(%{import_path}/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 +ExclusiveArch: %{ix86} x86_64 %{arm} +Provides: golang(%{import_path}/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 @@ -138,18 +176,15 @@ Provides: golang(%{import_path}/cmd/ssadump) = %{version}-%{release} %description ssadump %{summary}. - -## did not include the subpackages for ./cmd/oracle and ./cmd/ssadump, as they -## do not build for go1.1.2 https://bugzilla.redhat.com/show_bug.cgi?id=1029587 - %package devel -Requires: golang +Requires: golang >= 1.2.1-3 Summary: Libraries of supplementary Go tools %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 BuildArch: noarch %else ExclusiveArch: %{ix86} x86_64 %{arm} %endif +Provides: golang(%{import_path}/astutil) = %{version}-%{release} Provides: golang(%{import_path}/blog) = %{version}-%{release} Provides: golang(%{import_path}/blog/atom) = %{version}-%{release} Provides: golang(%{import_path}/cmd/vet/whitelist) = %{version}-%{release} @@ -157,21 +192,27 @@ Provides: golang(%{import_path}/container/intsets) = %{version}-%{release} Provides: golang(%{import_path}/cover) = %{version}-%{release} Provides: golang(%{import_path}/dashboard/app/build) = %{version}-%{release} Provides: golang(%{import_path}/dashboard/app/cache) = %{version}-%{release} +Provides: golang(%{import_path}/dashboard/app/key) = %{version}-%{release} Provides: golang(%{import_path}/dashboard/builder) = %{version}-%{release} -Provides: golang(%{import_path}/dashboard/updater) = %{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/exact) = %{version}-%{release} Provides: golang(%{import_path}/go/gccgoimporter) = %{version}-%{release} Provides: golang(%{import_path}/go/gcimporter) = %{version}-%{release} +Provides: golang(%{import_path}/go/gcimporter/testdata) = %{version}-%{release} Provides: golang(%{import_path}/go/importer) = %{version}-%{release} Provides: golang(%{import_path}/go/loader) = %{version}-%{release} +Provides: golang(%{import_path}/go/loader/testdata) = %{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/interp/testdata) = %{version}-%{release} Provides: golang(%{import_path}/go/ssa/ssautil) = %{version}-%{release} Provides: golang(%{import_path}/go/types) = %{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/redirect) = %{version}-%{release} @@ -189,40 +230,115 @@ 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/lexical) = %{version}-%{release} +Provides: golang(%{import_path}/refactor/rename) = %{version}-%{release} +Provides: golang(%{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. +which use the supplementary Go tools libraries with code.google.com/p/ imports. +%package -n %{x_name}-devel +Requires: golang >= 1.2.1-3 +Summary: Libraries of supplementary Go tools +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +BuildArch: noarch +%else +ExclusiveArch: %{ix86} x86_64 %{arm} +%endif +Provides: golang(%{x_import_path}/astutil) = %{version}-%{release} +Provides: golang(%{x_import_path}/blog) = %{version}-%{release} +Provides: golang(%{x_import_path}/blog/atom) = %{version}-%{release} +Provides: golang(%{x_import_path}/cmd/vet/whitelist) = %{version}-%{release} +Provides: golang(%{x_import_path}/container/intsets) = %{version}-%{release} +Provides: golang(%{x_import_path}/cover) = %{version}-%{release} +Provides: golang(%{x_import_path}/dashboard/app/build) = %{version}-%{release} +Provides: golang(%{x_import_path}/dashboard/app/cache) = %{version}-%{release} +Provides: golang(%{x_import_path}/dashboard/app/key) = %{version}-%{release} +Provides: golang(%{x_import_path}/dashboard/builder) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/buildutil) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/callgraph) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/callgraph/cha) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/callgraph/rta) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/callgraph/static) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/exact) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/gccgoimporter) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/gcimporter) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/gcimporter/testdata) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/importer) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/loader) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/loader/testdata) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/pointer) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/ssa) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/ssa/interp) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/ssa/interp/testdata) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/ssa/ssautil) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/types) = %{version}-%{release} +Provides: golang(%{x_import_path}/go/types/typeutil) = %{version}-%{release} +Provides: golang(%{x_import_path}/godoc) = %{version}-%{release} +Provides: golang(%{x_import_path}/godoc/analysis) = %{version}-%{release} +Provides: golang(%{x_import_path}/godoc/redirect) = %{version}-%{release} +Provides: golang(%{x_import_path}/godoc/static) = %{version}-%{release} +Provides: golang(%{x_import_path}/godoc/util) = %{version}-%{release} +Provides: golang(%{x_import_path}/godoc/vfs) = %{version}-%{release} +Provides: golang(%{x_import_path}/godoc/vfs/gatefs) = %{version}-%{release} +Provides: golang(%{x_import_path}/godoc/vfs/httpfs) = %{version}-%{release} +Provides: golang(%{x_import_path}/godoc/vfs/mapfs) = %{version}-%{release} +Provides: golang(%{x_import_path}/godoc/vfs/zipfs) = %{version}-%{release} +Provides: golang(%{x_import_path}/imports) = %{version}-%{release} +Provides: golang(%{x_import_path}/oracle) = %{version}-%{release} +Provides: golang(%{x_import_path}/oracle/serial) = %{version}-%{release} +Provides: golang(%{x_import_path}/playground) = %{version}-%{release} +Provides: golang(%{x_import_path}/playground/socket) = %{version}-%{release} +Provides: golang(%{x_import_path}/present) = %{version}-%{release} +Provides: golang(%{x_import_path}/refactor/eg) = %{version}-%{release} +Provides: golang(%{x_import_path}/refactor/importgraph) = %{version}-%{release} +Provides: golang(%{x_import_path}/refactor/lexical) = %{version}-%{release} +Provides: golang(%{x_import_path}/refactor/rename) = %{version}-%{release} +Provides: golang(%{x_import_path}/refactor/satisfy) = %{version}-%{release} + +%description -n %{x_name}-devel +%{summary} -%prep +This package contains library source intended for building other packages +which use the supplementary Go tools libraries with golang.org/x/ imports. -%setup -n tools.go-%{shortrev} +%prep +%setup -q -n tools.go-%{shortrev} %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} +mkdir -p src/$(dirname %{x_import_path}) +ln -s $(dirs +1 -l) src/%{x_import_path} export GOPATH=$(pwd):%{gopath} for cmd in \ benchcmp \ + callgraph \ cover \ + digraph \ eg \ godex \ godoc \ goimports \ + gorename \ gotype \ html2article \ oracle \ present \ ssadump \ + stringer \ vet do - go build -v -a %{import_path}/cmd/$cmd + go build -v -a %{x_import_path}/cmd/$cmd done popd @@ -230,16 +346,20 @@ 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/cover %{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/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} install -p -m 755 _build/vet %{buildroot}%{_bindir} # https://bugzilla.redhat.com/show_bug.cgi?id=1129281 @@ -248,6 +368,14 @@ ln -s %{_bindir}/cover %{buildroot}%{go_root}/pkg/tool/linux_%{go_arch}/cover ln -s %{_bindir}/vet %{buildroot}%{go_root}/pkg/tool/linux_%{go_arch}/vet install -d %{buildroot}/%{gopath}/src/%{import_path} +install -d %{buildroot}/%{gopath}/src/%{x_import_path} + +# directories defining more than one package name +rm -rf go/gccgoimporter/testdata \ + refactor/eg/testdata \ + cmd/vet/testdata \ + oracle/testdata/src/main + for d in \ astutil \ blog \ @@ -264,17 +392,12 @@ for d in \ refactor do cp -av $d %{buildroot}/%{gopath}/src/%{import_path}/ + cp -av $d %{buildroot}/%{gopath}/src/%{x_import_path}/ done -# generate the spec file ownership of this source tree -src_list=$(pwd)/src.list -touch $src_list -rm $src_list -pushd %{buildroot}%{gopath} - find src/ -type d -printf '%%%dir %{gopath}/%p\n' >> $src_list - find src/ ! -type d -printf '%{gopath}/%p\n' >> $src_list -popd - +cd %{buildroot}/%{gopath}/src/%{import_path}/ +sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \ + $(find . -name '*.go') %files -n golang-godoc %defattr(-,root,root,-) @@ -302,6 +425,22 @@ popd %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 @@ -326,11 +465,22 @@ popd %defattr(-,root,root,-) %{_bindir}/ssadump -%files -f src.list devel -%defattr(-,root,root,-) +%files devel +%doc AUTHORS CONTRIBUTORS LICENSE PATENTS README +%{gopath}/src/%{import_path} + +%files -n %{x_name}-devel %doc AUTHORS CONTRIBUTORS LICENSE PATENTS README +%{gopath}/src/%{x_import_path} %changelog +* Fri Mar 06 2015 jchaloup - 0-2.0.hga7e14835e46b +- Bump to a7e14835e46bb13da10fa8b9c9c5e7f2f378f568 +- Add new tools presented in the commit +- Change import paths to new prefix schema golang.org/x/... +- Add new subpackage and keep the only one for back-compatibility + resolves: #1199617 + * Tue Aug 19 2014 Vincent Batts - 0-1.0.hgd32b5854c941 - updating to the current latest go.tools diff --git a/sources b/sources index 4791d4e..fc9739c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee8180cf02b37b52aae3d688e3cc7321 d32b5854c9414bdc0767ff71709536a0922fe8b3.zip +4fafab266da03582c877a145d9a33376 a7e14835e46bb13da10fa8b9c9c5e7f2f378f568.tar.gz