diff --git a/.gitignore b/.gitignore index f1f4624..8714a23 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-11.tar.gz +SOURCES/osbuild-composer-14.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index ffb6f3c..2e6510f 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -925699a8f602a4cda208a05a1cd8caca6345079e SOURCES/osbuild-composer-11.tar.gz +d6be9a3e978e73a48c7105c98f16c0d5dc1ecec6 SOURCES/osbuild-composer-14.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 6e5e766..c003d32 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -4,7 +4,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 11 +Version: 14 %gometa @@ -18,6 +18,10 @@ Name: osbuild-composer Release: 1%{?dist} Summary: An image building service based on osbuild +# osbuild-composer doesn't have support for building i686 images +# and also RHEL and Fedora has now only limited support for this arch. +ExcludeArch: i686 + # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} @@ -44,7 +48,8 @@ BuildRequires: golang(github.com/stretchr/testify/assert) Requires: osbuild-composer-worker Requires: systemd -Requires: osbuild >= 12 +Requires: osbuild >= 15 +Requires: osbuild-ostree >= 15 Provides: weldr @@ -78,7 +83,7 @@ export GOFLAGS=-mod=vendor %gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker -%if %{with tests} +%if %{with tests} || 0%{?rhel} # 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 @@ -118,7 +123,7 @@ install -m 0644 -vp distribution/osbuild-composer.conf %{buildroot}%{_sysus install -m 0755 -vd %{buildroot}%{_localstatedir}/cache/osbuild-composer/dnf-cache -%if %{with tests} +%if %{with tests} || 0%{?rhel} install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer install -m 0755 -vp _bin/osbuild-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/ @@ -226,7 +231,7 @@ systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service" # restart all the worker services %systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service" -%if %{with tests} +%if %{with tests} || 0%{?rhel} %package tests Summary: Integration tests @@ -250,5 +255,8 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Thu May 28 2020 Ondrej Budai - 13-1 +- New upstream release 13 (rhbz#1831653) + * Tue May 05 2020 Ondrej Budai - 11-1 - Initial package (renamed from golang-github-osbuild-composer) (rhbz#1771887)