diff --git a/.gitignore b/.gitignore index 66054c5..1142634 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /osbuild-composer-23.tar.gz /osbuild-composer-24.tar.gz /osbuild-composer-25.tar.gz +/osbuild-composer-26.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index de906d0..adec380 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -4,7 +4,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 25 +Version: 26 %gometa @@ -31,6 +31,8 @@ Source0: %{gosource} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: systemd BuildRequires: krb5-devel +BuildRequires: python3-docutils +BuildRequires: make %if 0%{?fedora} BuildRequires: systemd-rpm-macros BuildRequires: git @@ -117,6 +119,7 @@ export GOFLAGS=-mod=vendor %gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer %gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker +make man %if %{with tests} || 0%{?rhel} @@ -160,6 +163,9 @@ install -m 0644 -vp distribution/osbuild-composer.conf %{buildroot}%{_s install -m 0755 -vd %{buildroot}%{_localstatedir}/cache/osbuild-composer/dnf-cache +install -m 0755 -vd %{buildroot}%{_mandir}/man7 +install -m 0644 -vp docs/*.7 %{buildroot}%{_mandir}/man7/ + %if %{with tests} || 0%{?rhel} install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer-test @@ -174,6 +180,7 @@ install -m 0755 -vp tools/provision.sh %{buildroot}%{_l install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/run-koji-container.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/ +install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer install -m 0755 -vp test/cases/* %{buildroot}%{_libexecdir}/tests/osbuild-composer/ @@ -239,6 +246,7 @@ cd $PWD/_build/src/%{goipath} %files %license LICENSE %doc README.md +%{_mandir}/man7/%{name}.7* %{_libexecdir}/osbuild-composer/osbuild-composer %{_libexecdir}/osbuild-composer/dnf-json %{_datadir}/osbuild-composer/ @@ -340,6 +348,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Thu Dec 17 2020 Ondrej Budai - 26-1 +- New upstream release + * Thu Nov 19 2020 Ondrej Budai - 25-1 - New upstream release diff --git a/sources b/sources index 5a5fb2c..8d4ba26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-25.tar.gz) = dcabcd59a361bf5eef3989e413902837b2d69fca58445d617b3c83bdba899048c8a53b04b9bb408207a3f7af505bc6cd703c3048c59ed5c0c74eb8b40b03ea5c +SHA512 (osbuild-composer-26.tar.gz) = f7c4ac0fadcbd443f72503067b3f90434c78d320c4555d54970409b720822f85fa454624bbd9e78d046817aef7976a22fcbd680b5f41309778be225b74b1b317