diff --git a/.gitignore b/.gitignore index b604c05..cdffad8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /osbuild-9.tar.gz /osbuild-10.tar.gz /osbuild-11.tar.gz +/osbuild-12.tar.gz diff --git a/osbuild.spec b/osbuild.spec index f2f9f0d..5ed96f1 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/osbuild/osbuild -Version: 11 +Version: 12 %forgemeta @@ -33,7 +33,7 @@ Requires: systemd Requires: systemd-container Requires: tar Requires: util-linux -Requires: python3-%{pypi_name} +Requires: python3-%{pypi_name} = %{version}-%{release} # Turn off dependency generators for assemblers, runners and stages. # They run in a container, so there's no reason to generate dependencies @@ -53,6 +53,16 @@ Summary: %{summary} %description -n python3-%{pypi_name} A build system for OS images +%package ostree +Summary: OSTree support +Requires: %{name} = %{version}-%{release} +Requires: ostree +Requires: rpm-ostree + +%description ostree +Contains the necessary stages, assembler and source +to build OSTree based images. + %prep %forgesetup @@ -96,6 +106,11 @@ exit 0 %{_mandir}/man1/%{name}.1* %{_mandir}/man5/%{name}-manifest.5* %{pkgdir} +# the following files are in the ostree sub-package +%exclude %{pkgdir}/assemblers/org.osbuild.ostree.commit +%exclude %{pkgdir}/sources/org.osbuild.ostree +%exclude %{pkgdir}/stages/org.osbuild.ostree +%exclude %{pkgdir}/stages/org.osbuild.rpm-ostree %files -n python3-%{pypi_name} %license LICENSE @@ -103,7 +118,20 @@ exit 0 %{python3_sitelib}/%{pypi_name}-*.egg-info/ %{python3_sitelib}/%{pypi_name}/ +%files ostree +%{pkgdir}/assemblers/org.osbuild.ostree.commit +%{pkgdir}/sources/org.osbuild.ostree +%{pkgdir}/stages/org.osbuild.ostree +%{pkgdir}/stages/org.osbuild.rpm-ostree + %changelog +* Wed Apr 15 2020 Christian Kellner - 12-1 +- new upstream release 12 +- Specify the exact version in the 'python3-osbuild' requirement + to avoid the library and the main binary being out of sync. +- osbuild-ostree sub-package with the necessary bits to create + OSTree based images + * Thu Apr 2 2020 Christian Kellner - 11-1 - new upstream release 11 - Turn of dependency generator for internal components diff --git a/sources b/sources index 85d20a5..d951f8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-11.tar.gz) = b58b2783ae525a65d5ce78faa62fda22ae912f7750e325b8916fa4e81a42e3eaaeb82a2a7c82665d5731aeb2b83344a950d47557220b4814f50eeb7f9f908ab4 +SHA512 (osbuild-12.tar.gz) = 9dc2a151ac337bd945cbaa2566f2789bc1d019d916c8a47b66bbd21f9e19f4c56276508fe6a7871bc52d40795078336ad4b56de3fd50f63222dd41303e11619d