spec: sync the line order and whitespace changes
In the new spec file, the tests-related code is always at the bottom of the containing block to make the conditional code easier to read. Do the same in the old spec file. Also, in the new spec file, some whitespaces are different (rpmlint reported mix used of tabs and spaces), let's do the same changes in the old spec file.
This commit is contained in:
Ondřej Budai
Tom Gundersen
parent
cdc4248909
commit
b45119c471
1 changed files with 36 additions and 35 deletions
|
|
@ -65,6 +65,7 @@ export PATH=$PWD/_bin${PATH:+:$PATH}
|
||||||
export GOPATH=$GO_BUILD_PATH:%{gopath}
|
export GOPATH=$GO_BUILD_PATH:%{gopath}
|
||||||
export GOFLAGS=-mod=vendor
|
export GOFLAGS=-mod=vendor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
|
%gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
|
||||||
%gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
|
%gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
|
||||||
|
|
||||||
|
|
@ -86,25 +87,9 @@ install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_libex
|
||||||
install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/
|
install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||||
install -m 0755 -vp dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/
|
install -m 0755 -vp dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
|
|
||||||
install -m 0755 -vp _bin/osbuild-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
|
||||||
install -m 0755 -vp _bin/osbuild-weldr-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
|
||||||
install -m 0755 -vp _bin/osbuild-dnf-json-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
|
||||||
install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
|
||||||
install -m 0755 -vp _bin/osbuild-rcm-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
|
||||||
install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer/
|
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
|
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
|
||||||
install -m 0644 -vp repositories/* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
install -m 0644 -vp repositories/* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/cases
|
|
||||||
install -m 0644 -vp test/cases/* %{buildroot}%{_datadir}/tests/osbuild-composer/cases/
|
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/keyring
|
|
||||||
install -m 0600 -vp test/keyring/* %{buildroot}%{_datadir}/tests/osbuild-composer/keyring/
|
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init
|
|
||||||
install -m 0644 -vp test/cloud-init/* %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init/
|
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_unitdir}
|
install -m 0755 -vd %{buildroot}%{_unitdir}
|
||||||
install -m 0644 -vp distribution/*.{service,socket} %{buildroot}%{_unitdir}/
|
install -m 0644 -vp distribution/*.{service,socket} %{buildroot}%{_unitdir}/
|
||||||
|
|
||||||
|
|
@ -113,6 +98,22 @@ install -m 0644 -vp distribution/osbuild-composer.conf %{buildroot}%{_sysus
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_localstatedir}/cache/osbuild-composer/dnf-cache
|
install -m 0755 -vd %{buildroot}%{_localstatedir}/cache/osbuild-composer/dnf-cache
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
|
||||||
|
install -m 0755 -vp _bin/osbuild-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
||||||
|
install -m 0755 -vp _bin/osbuild-weldr-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
||||||
|
install -m 0755 -vp _bin/osbuild-dnf-json-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
||||||
|
install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
||||||
|
install -m 0755 -vp _bin/osbuild-rcm-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
||||||
|
install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/cases
|
||||||
|
install -m 0644 -vp test/cases/* %{buildroot}%{_datadir}/tests/osbuild-composer/cases/
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/keyring
|
||||||
|
install -m 0600 -vp test/keyring/* %{buildroot}%{_datadir}/tests/osbuild-composer/keyring/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init
|
||||||
|
install -m 0644 -vp test/cloud-init/* %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init/
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
export GOFLAGS=-mod=vendor
|
export GOFLAGS=-mod=vendor
|
||||||
|
|
@ -143,8 +144,8 @@ export GOPATH=$PWD/_build:%{gopath}
|
||||||
%{_sysusersdir}/osbuild-composer.conf
|
%{_sysusersdir}/osbuild-composer.conf
|
||||||
|
|
||||||
%package rcm
|
%package rcm
|
||||||
Summary: RCM-specific version of osbuild-composer
|
Summary: RCM-specific version of osbuild-composer
|
||||||
Requires: osbuild-composer
|
Requires: osbuild-composer
|
||||||
|
|
||||||
%description rcm
|
%description rcm
|
||||||
RCM-specific version of osbuild-composer not intended for public usage.
|
RCM-specific version of osbuild-composer not intended for public usage.
|
||||||
|
|
@ -161,24 +162,8 @@ RCM-specific version of osbuild-composer not intended for public usage.
|
||||||
%postun rcm
|
%postun rcm
|
||||||
%systemd_postun_with_restart osbuild-rcm.socket
|
%systemd_postun_with_restart osbuild-rcm.socket
|
||||||
|
|
||||||
%package tests
|
|
||||||
Summary: Integration tests
|
|
||||||
Requires: osbuild-composer
|
|
||||||
Requires: composer-cli
|
|
||||||
Requires: createrepo_c
|
|
||||||
Requires: genisoimage
|
|
||||||
Requires: qemu-kvm-core
|
|
||||||
|
|
||||||
%description tests
|
|
||||||
Integration tests to be run on a pristine-dedicated system to test the osbuild-composer package.
|
|
||||||
|
|
||||||
%files tests
|
|
||||||
%{_libexecdir}/tests/osbuild-composer/
|
|
||||||
%{_datadir}/tests/osbuild-composer/
|
|
||||||
%{_libexecdir}/osbuild-composer/image-info
|
|
||||||
|
|
||||||
%package worker
|
%package worker
|
||||||
Summary: The worker for osbuild-composer
|
Summary: The worker for osbuild-composer
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
Requires: osbuild
|
Requires: osbuild
|
||||||
|
|
||||||
|
|
@ -199,5 +184,21 @@ The worker for osbuild-composer
|
||||||
%postun worker
|
%postun worker
|
||||||
%systemd_postun_with_restart osbuild-worker@.service osbuild-remote-worker@.service
|
%systemd_postun_with_restart osbuild-worker@.service osbuild-remote-worker@.service
|
||||||
|
|
||||||
|
%package tests
|
||||||
|
Summary: Integration tests
|
||||||
|
Requires: osbuild-composer
|
||||||
|
Requires: composer-cli
|
||||||
|
Requires: createrepo_c
|
||||||
|
Requires: genisoimage
|
||||||
|
Requires: qemu-kvm-core
|
||||||
|
|
||||||
|
%description tests
|
||||||
|
Integration tests to be run on a pristine-dedicated system to test the osbuild-composer package.
|
||||||
|
|
||||||
|
%files tests
|
||||||
|
%{_libexecdir}/tests/osbuild-composer/
|
||||||
|
%{_datadir}/tests/osbuild-composer/
|
||||||
|
%{_libexecdir}/osbuild-composer/image-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
# the changelog is distribution-specific, therefore it doesn't make sense to have it upstream
|
# the changelog is distribution-specific, therefore it doesn't make sense to have it upstream
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue