Attachment 1976943 Details for Bug 2218606 – The .spec file difference from Copr build 6186417 to 6200299

[patch] The .spec file difference from Copr build 6186417 to 6200299

spec-from-6186417-to-6200299.diff (text/plain), 5.30 KB, created by Fedora Review Service on 2023-07-21 15:04:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fedora Review Service

Created: 2023-07-21 15:04:52 UTC

Size: 5.30 KB

patch

obsolete

>--- https://copr.fedorainfracloud.org/coprs/build/6186417
>+++ https://copr.fedorainfracloud.org/coprs/build/6200299
>@@ -15,11 +15,17 @@
> # on the test host.
> %bcond_with check
> 
>+# This list of drivers are included when compiling the 'migrate' program.
>+%global _gobuildtags cassandra cockroachdb mongodb mysql postgres redshift \\\
>+                     snowflake sqlite3 github gitlab go_bindata godoc_vfs \\\
>+                     google_cloud_storage iofs pkger aws_s3 filesystem
>+
> # This list of drivers are removed before the package is built. This ensures
> # that both the migrate binary and the -devel subpackage are both built with the
> # desired set of drivers. These drivers are missing depdendencies; packaging
> # their dependencies is required before removing a driver from this list.
>-%global _remove_drivers database/firebird \\\
>+%global _remove_drivers database/clickhouse \\\
>+                        database/firebird \\\
>                         database/neo4j \\\
>                         database/pgx \\\
>                         database/ql \\\
>@@ -28,8 +34,7 @@
>                         database/sqlite \\\
>                         database/sqlserver \\\
>                         database/yugabytedb \\\
>-                        source/bitbucket \\\
>-                        source/github
>+                        source/bitbucket
> 
> # https://github.com/golang-migrate/migrate
> %global goipath         github.com/golang-migrate/migrate/v4
>@@ -44,7 +49,6 @@
> 
> This package is built with the following databases backends:
> * cassandra
>-* clickhouse
> * cockroachdb
> * mongodb
> * mysql
>@@ -54,7 +58,7 @@
> * sqlite3
> 
> This package is built with the following source backends:
>-* file
>+* github
> * gitlab
> * go-bindata
> * godoc-vfs
>@@ -67,7 +71,6 @@
> %global godocs         CONTRIBUTING.md FAQ.md GETTING_STARTED.md \\\
>                        MIGRATIONS.md README.md SECURITY.md migrate-README.md \\\
>                        cassandra-README.md \\\
>-                       clickhouse-README.md \\\
>                        cockroachdb-README.md \\\
>                        mongodb-README.md \\\
>                        mysql-README.md \\\
>@@ -76,6 +79,7 @@
>                        snowflake-README.md \\\
>                        sqlite3-README.md \\\
>                        file-README.md \\\
>+                       github-README.md \\\
>                        gitlab-README.md \\\
>                        go-bindata-README.md \\\
>                        gcs-README.md \\\
>@@ -90,6 +94,8 @@
> License:        MIT
> URL:            %{gourl}
> Source:         %{gosource}
>+# Submitted upstream: https://github.com/golang-migrate/migrate/pull/958
>+Patch0:         0001-refactor-update-go-gitlab.patch
> 
> # Do not use %%go_generate_buildrequires; the list of drivers is maintained
> # manually. See %%_remove_drivers above for details.
>@@ -102,6 +108,7 @@
> BuildRequires: golang(github.com/cockroachdb/cockroach-go/v2/crdb)
> BuildRequires: golang(github.com/go-sql-driver/mysql)
> BuildRequires: golang(github.com/gocql/gocql)
>+BuildRequires: golang(github.com/google/go-github/github)
> BuildRequires: golang(github.com/hashicorp/go-multierror)
> BuildRequires: golang(github.com/lib/pq)
> BuildRequires: golang(github.com/markbates/pkger)
>@@ -125,12 +132,20 @@
> %prep
> %goprep
> %autopatch -p1
>+sed -i \
>+    -e 's|"github.com/google/go-github/v39/github|"github.com/google/go-github/github|' \
>+    $(find . -name '*.go')
> rm -rf %_remove_drivers
>+# remove zero length README files
>+rm database/crate/README.md
>+rm database/shell/README.md
>+# remove test files that require dktest
>+rm $(grep -lr '"github.com/dhui/dktest"')
> 
> %build
>-for cmd in cmd/* ; do
>-  %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
>-done
>+export BUILDTAGS="%{_gobuildtags}"
>+export LDFLAGS="-X main.Version=%{version}"
>+%gobuild -o %{gobuilddir}/bin/migrate %{goipath}/cmd/migrate
> 
> %install
> %gopkginstall
>@@ -138,7 +153,6 @@
> install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
> mv cmd/migrate/README.md                 migrate-README.md
> mv database/cassandra/README.md          cassandra-README.md
>-mv database/clickhouse/README.md         clickhouse-README.md
> mv database/cockroachdb/README.md        cockroachdb-README.md
> mv database/mongodb/README.md            mongodb-README.md
> mv database/mysql/README.md              mysql-README.md
>@@ -148,6 +162,7 @@
> mv database/sqlite3/README.md            sqlite3-README.md
> mv source/aws_s3/README.md               s3-README.md
> mv source/file/README.md                 file-README.md
>+mv source/github/README.md               github-README.md
> mv source/gitlab/README.md               gitlab-README.md
> mv source/go_bindata/README.md           go-bindata-README.md
> mv source/google_cloud_storage/README.md gcs-README.md
>@@ -164,7 +179,6 @@
> %doc CONTRIBUTING.md FAQ.md GETTING_STARTED.md MIGRATIONS.md README.md
> %doc SECURITY.md migrate-README.md
> %doc cassandra-README.md
>-%doc clickhouse-README.md
> %doc cockroachdb-README.md
> %doc mongodb-README.md
> %doc mysql-README.md
>@@ -173,6 +187,7 @@
> %doc snowflake-README.md
> %doc sqlite3-README.md
> %doc file-README.md
>+%doc github-README.md
> %doc gitlab-README.md
> %doc go-bindata-README.md
> %doc gcs-README.md
>@@ -184,6 +199,6 @@
> %gopkgfiles
> 
> %changelog
>-* Wed Jul 19 2023 Link Dupont <link@sub-pop.net> - 4.16.2-1
>+* Fri Jul 21 2023 Link Dupont <link@sub-pop.net> - 4.16.2-1
> - Uncommitted changes
>

Actions: View | Diff

Attachments on bug 2218606: 1976225 | 1976549 | 1976943