summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Alexandre Salim <salimma@fedoraproject.org>2022-05-11 14:39:01 -0700
committerMichel Alexandre Salim <salimma@fedoraproject.org>2022-05-11 14:39:01 -0700
commit15dd5e15789d983c5655827daa8de34ee99167c0 (patch)
tree2628f6c2a5b0a75a95a17cb96462a6df5bbaa263
parent8102ce0280bbda144d84f625c2d7dd9aa6e1e641 (diff)
downloadspecs-master.tar.gz
specs-master.tar.xz
specs-master.zip
golang-entgo-ent: tidy up spec for reviewHEADmaster
Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
-rw-r--r--meta/golang-entgo-ent.spec34
1 files changed, 4 insertions, 30 deletions
diff --git a/meta/golang-entgo-ent.spec b/meta/golang-entgo-ent.spec
index 85fc245..d68b0ad 100644
--- a/meta/golang-entgo-ent.spec
+++ b/meta/golang-entgo-ent.spec
@@ -53,48 +53,21 @@ BuildRequires: golang(golang.org/x/tools/imports)
%if %{with check}
# Tests
BuildRequires: golang(github.com/DATA-DOG/go-sqlmock)
-# BuildRequires: golang(github.com/google/uuid)
-# BuildRequires: golang(github.com/gorilla/websocket)
BuildRequires: golang(github.com/jessevdk/go-flags)
BuildRequires: golang(github.com/json-iterator/go)
-# BuildRequires: golang(github.com/modern-go/reflect2)
BuildRequires: golang(github.com/stretchr/testify/assert)
BuildRequires: golang(github.com/stretchr/testify/mock)
BuildRequires: golang(github.com/stretchr/testify/require)
BuildRequires: golang(golang.org/x/tools/go/packages/packagestest)
-# BuildRequires: golang(go.opencensus.io/stats/view)
-# BuildRequires: golang(go.opencensus.io/trace)
%endif
-# goimport fails to pick up these
-# _build/src/entgo.io/ent/dialect/sql/schema/atlas.go:15:2: cannot find package "ariga.io/atlas/sql/migrate" in any of:
-# /usr/lib/golang/src/ariga.io/atlas/sql/migrate (from $GOROOT)
-# /builddir/build/BUILD/ent-0.10.1/_build/src/ariga.io/atlas/sql/migrate (from $GOPATH)
-# /usr/share/gocode/src/ariga.io/atlas/sql/migrate
-# _build/src/entgo.io/ent/dialect/sql/schema/mysql.go:20:2: cannot find package "ariga.io/atlas/sql/mysql" in any of:
-# /usr/lib/golang/src/ariga.io/atlas/sql/mysql (from $GOROOT)
-# /builddir/build/BUILD/ent-0.10.1/_build/src/ariga.io/atlas/sql/mysql (from $GOPATH)
-# /usr/share/gocode/src/ariga.io/atlas/sql/mysql
-# _build/src/entgo.io/ent/dialect/sql/schema/postgres.go:19:2: cannot find package "ariga.io/atlas/sql/postgres" in any of:
-# /usr/lib/golang/src/ariga.io/atlas/sql/postgres (from $GOROOT)
-# /builddir/build/BUILD/ent-0.10.1/_build/src/ariga.io/atlas/sql/postgres (from $GOPATH)
-# /usr/share/gocode/src/ariga.io/atlas/sql/postgres
-# _build/src/entgo.io/ent/dialect/sql/schema/atlas.go:16:2: cannot find package "ariga.io/atlas/sql/schema" in any of:
-# /usr/lib/golang/src/ariga.io/atlas/sql/schema (from $GOROOT)
-# /builddir/build/BUILD/ent-0.10.1/_build/src/ariga.io/atlas/sql/schema (from $GOPATH)
-# /usr/share/gocode/src/ariga.io/atlas/sql/schema
-# _build/src/entgo.io/ent/dialect/sql/schema/sqlite.go:19:2: cannot find package "ariga.io/atlas/sql/sqlite" in any of:
-# /usr/lib/golang/src/ariga.io/atlas/sql/sqlite (from $GOROOT)
-# /builddir/build/BUILD/ent-0.10.1/_build/src/ariga.io/atlas/sql/sqlite (from $GOPATH)
-# /usr/share/gocode/src/ariga.io/atlas/sql/sqlite
+# manually-added BRs
BuildRequires: golang(ariga.io/atlas/sql/migrate)
BuildRequires: golang(ariga.io/atlas/sql/mysql)
BuildRequires: golang(ariga.io/atlas/sql/postgres)
BuildRequires: golang(ariga.io/atlas/sql/schema)
BuildRequires: golang(ariga.io/atlas/sql/sqlite)
-# and these
-# BuildRequires: golang(github.com/golang-migrate/migrate/v4)
%description
%{common_description}
@@ -103,9 +76,10 @@ BuildRequires: golang(ariga.io/atlas/sql/sqlite)
%prep
%goprep
+# rename integration doc to avoid name clash
+mv entc/integration/README.md entc/integration/README-integration.md
%generate_buildrequires
-# %%go_generate_buildrequires
%build
for cmd in cmd/ent* ; do
@@ -128,7 +102,7 @@ rm entc/load/load_test.go
%files
%license LICENSE
%doc doc examples README.md README_jp.md CODE_OF_CONDUCT.md CONTRIBUTING.md
-%doc README_zh.md entc/integration/README.md doc
+%doc README_zh.md entc/integration/README-integration.md doc
%{_bindir}/*
%gopkgfiles