From 4850ea26fec155beaa977064bcf201ee8e75ad77 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Apr 16 2019 15:34:15 +0000 Subject: Bump to commit 2e9de471ebd3a3af420e4dd35a826936b94da7f6 Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index cef7488..b0460e1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /tools-ce871d1.tar.gz /tools-ce871d178848e3eea1e8795e5cfb74053dde4bb9.tar.gz /tools-9394956cfdc50651347ab69dbde09af8a8e24776.tar.gz +/tools-2e9de471ebd3a3af420e4dd35a826936b94da7f6.tar.gz diff --git a/golang-googlecode-tools.spec b/golang-googlecode-tools.spec index f7db221..5f17e95 100644 --- a/golang-googlecode-tools.spec +++ b/golang-googlecode-tools.spec @@ -1,36 +1,48 @@ +# Generated by go2rpm +%bcond_without check + # https://github.com/golang/tools -%global forgeurl https://github.com/golang/tools %global goipath golang.org/x/tools -%global commit 9394956cfdc50651347ab69dbde09af8a8e24776 - -Version: 0 +%global forgeurl https://github.com/golang/tools +%global commit 2e9de471ebd3a3af420e4dd35a826936b94da7f6 %gometa -%global x_name golang-golangorg-tools +%global common_description %{expand: +This package holds the source for various tools that support the Go programming +language. -%global go_arch %(go env GOHOSTARCH) -%global go_root %(go env GOROOT) +Some of the tools, godoc and vet for example, are included in binary Go +distributions. -%global commands benchcmp bundle callgraph compilebench cover digraph eg fiximports getgo go-contrib-init godex godoc goimports gomvpkg gopls gorename gotype goyacc guru html2article present splitdwarf ssadump stress stringer toolstash +Others, including the Go guru and the test coverage tool, can be fetched with go +get. + +Packages include a type-checker for Go and an implementation of the Static +Single Assignment form (SSA) representation for Go programs.} + +%global golicenses LICENSE PATENTS +%global godocs AUTHORS CONTRIBUTING.md CONTRIBUTORS README.md + +%global commands benchcmp bundle callgraph compilebench cover digraph eg fiximports getgo go-contrib-init godex godoc goimports gopls gomvpkg gorename gotype goyacc guru html2article present splitdwarf ssadump stress stringer toolstash + +Name: %{goname} +Version: 0 +Release: 28%{?dist} +Summary: Various packages and tools that support the Go programming language -Name: golang-googlecode-tools -Release: 27%{?dist} -Summary: Supplementary tools and packages for Go +# Upstream license specification: BSD-3-Clause License: BSD URL: %{gourl} Source0: %{gosource} -BuildRequires: golang(github.com/gomodule/redigo/redis) -BuildRequires: golang(golang.org/x/net/context/ctxhttp) -BuildRequires: golang(golang.org/x/net/websocket) -BuildRequires: golang(google.golang.org/appengine) -BuildRequires: golang(google.golang.org/appengine/log) -BuildRequires: golang(google.golang.org/appengine/urlfetch) -BuildRequires: golang(google.golang.org/appengine/user) +BuildRequires: golang(golang.org/x/net/context/ctxhttp) +BuildRequires: golang(golang.org/x/net/html) +BuildRequires: golang(golang.org/x/net/html/atom) +BuildRequires: golang(golang.org/x/net/websocket) %description -%{summary} +%{common_description} %package -n golang-godoc Summary: Documentation tool for the Go programming language @@ -50,7 +62,6 @@ 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 analysis fails; otherwise gotype is quiet. - %package -n golang-html2article Summary: Tool for creating articles from HTML files Provides: golang(%{goipath}/cmd/html2article) = %{version}-%{release} @@ -89,7 +100,7 @@ Summary: Tool performs queries over unlabelled directed graphs represente Provides: golang(%{goipath}/cmd/digraph) = %{version}-%{release} %description digraph -The digraph command performs queries over unlabelled directed graphs +The digraph command performs queries over unlabelled directed graphs represented in text form. %package gorename @@ -104,7 +115,7 @@ Summary: Tool to automate the creation of methods that satisfy the fmt.St Provides: golang(%{goipath}/cmd/stringer) = %{version}-%{release} %description stringer -tool to automate the creation of methods that satisfy the fmt.Stringer +tool to automate the creation of methods that satisfy the fmt.Stringer interface. %package godex @@ -256,40 +267,30 @@ Provides: golang(%{goipath}/cmd/goyacc) = %{version}-%{release} See https://godoc.org/golang.org/x/tools/cmd/goyacc for more information. -%package -n %{x_name}-devel -Summary: Libraries of supplementary Go tools - -BuildRequires: golang-docs - -%description -n %{x_name}-devel -%{summary} - -This package contains library source intended for building other packages -which use the supplementary Go tools libraries with golang.org/x/ imports. +%gopkg %prep -%forgesetup +%goprep + %build %gobuildroot for cmd in %commands; do - %gobuild -o _bin/$cmd %{goipath}/cmd/$cmd + %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/cmd/$cmd done %install -install -d %{buildroot}%{_bindir} -for cmd in %commands; do - install -p -m 755 _bin/$cmd %{buildroot}%{_bindir} -done +%gopkginstall +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ + # Fix conflict with rubygem-bundler mv %{buildroot}%{_bindir}/bundle %{buildroot}%{_bindir}/gobundle -# source codes for building projects -files="$(find . -name 'testdata' -type d)" -%goinstall $files - +%if %{with check} %check -%gochecks -d go/gcimporter15 +%gocheck +%endif %files -n golang-godoc %{_bindir}/godoc @@ -369,11 +370,12 @@ files="$(find . -name 'testdata' -type d)" %files goyacc %{_bindir}/goyacc -%files -n %{x_name}-devel -f devel.file-list -%license LICENSE PATENTS -%doc AUTHORS CONTRIBUTORS CONTRIBUTING.md README.md +%gopkgfiles %changelog +* Tue Apr 16 16:42:02 CEST 2019 Robert-André Mauchin - 0-28.20190416git2e9de47 +- Bump to commit 2e9de471ebd3a3af420e4dd35a826936b94da7f6 + * Mon Mar 04 2019 Robert-André Mauchin - 0-27.20190219git9394956 - Fix conflict with rubygem-bundler (#1685237) @@ -401,7 +403,7 @@ files="$(find . -name 'testdata' -type d)" - Autogenerate some parts using the new macros * Thu Feb 15 2018 Robert-André Mauchin - 0-20.1.20180214gitce871d1 -- Bump to upstream ce871d178848e3eea1e8795e5cfb74053dde4bb9 +- Bump to upstream ce871d178848e3eea1e8795e5cfb74053dde4bb9 * Wed Feb 07 2018 Fedora Release Engineering - 0-19.1.git9deed8c - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 602e6a7..842e492 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tools-9394956cfdc50651347ab69dbde09af8a8e24776.tar.gz) = 867aa7a7c814c40532ed080c38e6b7f98d7be7318a4d0d2a62395c3eb497597bde1caaec797ec3ca59367b6c4fae811c27b0b7971ca3a0f63b393bc4ae74fa6f +SHA512 (tools-2e9de471ebd3a3af420e4dd35a826936b94da7f6.tar.gz) = 71c0991ede902b9d3ac137c7ba3a650d6ce082ba78b73aafc022482367f77b96986e5795663cdc4cbcc000a0b7398caf15dc3c0eeef1108c58ad13fbc33794c4