diff --git a/.gitignore b/.gitignore index 0f57b26..d4ae143 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /7.tar.gz /osbuild-8.tar.gz /osbuild-9.tar.gz +/osbuild-10.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 5f6d30c..63bb21e 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/osbuild/osbuild -Version: 9 +Version: 10 %forgemeta @@ -17,21 +17,23 @@ Source0: %{forgesource} BuildArch: noarch Summary: A build system for OS images +BuildRequires: make BuildRequires: python3-devel +BuildRequires: python3-docutils -Requires: bash -Requires: coreutils -Requires: curl -Requires: dnf -Requires: e2fsprogs -Requires: glibc -Requires: policycoreutils -Requires: qemu-img -Requires: systemd -Requires: systemd-container -Requires: tar -Requires: util-linux -Requires: python3-%{pypi_name} +Requires: bash +Requires: coreutils +Requires: curl +Requires: dnf +Requires: e2fsprogs +Requires: glibc +Requires: policycoreutils +Requires: qemu-img +Requires: systemd +Requires: systemd-container +Requires: tar +Requires: util-linux +Requires: python3-%{pypi_name} %{?python_enable_dependency_generator} @@ -42,7 +44,7 @@ A build system for OS images Summary: %{summary} %{?python_provide:%python_provide python3-%{pypi_name}} -%description -n python3-%{pypi_name} +%description -n python3-%{pypi_name} A build system for OS images %prep @@ -50,6 +52,7 @@ A build system for OS images %build %py3_build +make man %install %py3_install @@ -70,6 +73,12 @@ install -p -m 0755 $(find sources -type f) %{buildroot}%{pkgdir}/sources mkdir -p %{buildroot}%{pkgdir}/stages/osbuild mkdir -p %{buildroot}%{pkgdir}/assemblers/osbuild +# documentation +mkdir -p %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_mandir}/man5 +install -p -m 0644 -t %{buildroot}%{_mandir}/man1/ docs/*.1 +install -p -m 0644 -t %{buildroot}%{_mandir}/man5/ docs/*.5 + %check exit 0 # We have some integration tests, but those require running a VM, so that would @@ -78,17 +87,25 @@ exit 0 %files %license LICENSE %{_bindir}/osbuild +%{_mandir}/man1/%{name}.1* +%{_mandir}/man5/%{name}-manifest.5* %{pkgdir} -%files -n python3-%{pypi_name} +%files -n python3-%{pypi_name} %license LICENSE -%doc README.md +%doc README.md NEWS.md %{python3_sitelib}/%{pypi_name}-*.egg-info/ %{python3_sitelib}/%{pypi_name}/ %changelog +* Thu Mar 19 2020 Christian Kellner - 10-1 +- new upstream release 10 +- build and include man pages, this adds 'make' and 'python3-docutils' + to the build requirements +- add NEWS.md file with the release notes + * Thu Mar 5 2020 Christian Kellner - 9-1 -- new upstream release: 8 +- new upstream release: 9 - Remove host runner link, it now is being auto-detected - Cleanup use of mixed use of spaces/tabs diff --git a/sources b/sources index c7441cb..2261e56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-9.tar.gz) = f20fd6c6dbca2cb3b0b88614558495e7f97644a25d2bc8af1af3e15e52f49eacbdb3e3eb93bda19a4085b5a8e086e56442b1cb7e2fd1e51204efe44b4191bea6 +SHA512 (osbuild-10.tar.gz) = 0004ee8009ab7186e54c4b1c579a384e06fb3ca6be948b0050965ad341bdfaa73c269832033be3520761da920303e1645aa79c6048accf7670813b172b966622