diff --git a/.gitignore b/.gitignore index 4287417..1345cb8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /osbuild-composer-10.tar.gz /osbuild-composer-11.tar.gz /osbuild-composer-12.tar.gz +/osbuild-composer-13.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index d6d94b8..aba8961 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -4,7 +4,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 12 +Version: 13 %gometa @@ -44,7 +44,7 @@ BuildRequires: golang(github.com/stretchr/testify/assert) Requires: osbuild-composer-worker Requires: systemd -Requires: osbuild >= 12 +Requires: osbuild >= 15 Provides: weldr @@ -78,7 +78,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 +118,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 +226,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,6 +250,9 @@ 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 + * Thu May 14 2020 Ondrej Budai - 12-1 - New upstream release diff --git a/sources b/sources index 01e5b0e..9468841 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-12.tar.gz) = b5b2150be288e282eeb986e38e5c866bb0069f4969ae2656d1980f2caf3d857a07a7ace26c77cb64523f2f9ca8f16c21aecaceffe3017ff2ecc6740bbb71ff83 +SHA512 (osbuild-composer-13.tar.gz) = 6b5344fede0cebf37a3b8d2b95e2a9937ff6a3350cd411790ba75b2fd693a16acee9f5b761bb26d0f905ae92474c100915a27e04355acb64732c46bb11bd821b