New upstream release 9

This commit is contained in:
Ondřej Budai 2020-04-01 16:11:41 +02:00
parent b42061e287
commit 32f1257212
3 changed files with 21 additions and 3 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/osbuild-composer-8.tar.gz /osbuild-composer-8.tar.gz
/osbuild-composer-9.tar.gz

View File

@ -1,6 +1,10 @@
# Do not build with tests by default
# Pass --with tests to rpmbuild to override
%bcond_with tests
%global goipath github.com/osbuild/osbuild-composer %global goipath github.com/osbuild/osbuild-composer
Version: 8 Version: 9
%gometa %gometa
@ -43,6 +47,7 @@ Requires: osbuild >= 7
Provides: weldr Provides: weldr
# remove in F34
Obsoletes: golang-github-osbuild-composer < %{version}-%{release} Obsoletes: golang-github-osbuild-composer < %{version}-%{release}
Provides: golang-github-osbuild-composer = %{version}-%{release} Provides: golang-github-osbuild-composer = %{version}-%{release}
@ -77,12 +82,19 @@ export GOFLAGS=-mod=vendor
# Build test binaries with `go test -c`, so that they can take advantage of # Build test binaries with `go test -c`, so that they can take advantage of
# golang's testing package. The golang rpm macros don't support building them # golang's testing package. The golang rpm macros don't support building them
# directly. Thus, do it manually, taking care to also include a build id. # directly. Thus, do it manually, taking care to also include a build id.
#
# On Fedora, also turn off go modules and set the path to the one into which
# the golang-* packages install source code.
%if 0%{?fedora}
export GO111MODULE=off
export GOPATH=%{gobuilddir}:%{gopath}
%endif
TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')" TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-tests %{goipath}/cmd/osbuild-tests go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-tests %{goipath}/cmd/osbuild-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/weldrcheck/ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-rcm-tests %{goipath}/cmd/osbuild-rcm-tests go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-rcm-tests %{goipath}/cmd/osbuild-rcm-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests
@ -158,6 +170,7 @@ export GOPATH=$PWD/_build:%{gopath}
Summary: RCM-specific version of osbuild-composer Summary: RCM-specific version of osbuild-composer
Requires: osbuild-composer Requires: osbuild-composer
# remove in F34
Obsoletes: golang-github-osbuild-composer-rcm < %{version}-%{release} Obsoletes: golang-github-osbuild-composer-rcm < %{version}-%{release}
Provides: golang-github-osbuild-composer-rcm = %{version}-%{release} Provides: golang-github-osbuild-composer-rcm = %{version}-%{release}
@ -181,6 +194,7 @@ Summary: The worker for osbuild-composer
Requires: systemd Requires: systemd
Requires: osbuild Requires: osbuild
# remove in F34
Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release} Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
Provides: golang-github-osbuild-composer-worker = %{version}-%{release} Provides: golang-github-osbuild-composer-worker = %{version}-%{release}
@ -222,5 +236,8 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif %endif
%changelog %changelog
* Wed Apr 01 2020 Ondrej Budai <obudai@redhat.com> - 9-1
- New upstream release
* Mon Mar 23 2020 Ondrej Budai <obudai@redhat.com> - 8-1 * Mon Mar 23 2020 Ondrej Budai <obudai@redhat.com> - 8-1
- Initial package (renamed from golang-github-osbuild-composer) - Initial package (renamed from golang-github-osbuild-composer)

View File

@ -1 +1 @@
SHA512 (osbuild-composer-8.tar.gz) = 374cb9a58e013ca1f9b03818f8d57925cb447fe7da9d9a208635313718417f9d3ca93723f834386f808de31228d5fc9138545f33bde4ae0b49d6ce94349a9ed7 SHA512 (osbuild-composer-9.tar.gz) = 6ea49430501eda844b2de656116c58cfc27288f7642c22a1231ce6074dc587e28d8fbaf3a99cc58a8f5caacdd9315444f16c6bed7041c72b80b1502f12085f7c