diff --git a/.gitignore b/.gitignore index 0ea2de3..2bc47d9 100644 --- a/.gitignore +++ b/.gitignore @@ -169,3 +169,4 @@ /cockpit-211.tar.xz /cockpit-211.1.tar.xz /cockpit-212.tar.xz +/cockpit-213.tar.xz diff --git a/cockpit.spec b/cockpit.spec index 945649c..27246d7 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 212 +Version: 213 Release: 1%{?dist} # # This file is maintained at the following location: @@ -204,15 +204,17 @@ echo '%dir %{_datadir}/cockpit/playground' > tests.list find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x -%if 0%{?fedora} +%if 0%{?fedora} && 0%{?build_optional} +%define build_docker 1 +%endif +%endif + +%if 0%{?build_docker} echo '%dir %{_datadir}/cockpit/docker' > docker.list find %{buildroot}%{_datadir}/cockpit/docker -type f >> docker.list %else rm -rf %{buildroot}/%{_datadir}/cockpit/docker -touch docker.list -%endif -%else -rm -rf %{buildroot}/%{_datadir}/cockpit/docker +rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml touch docker.list %endif @@ -250,6 +252,8 @@ rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml # files from -storaged rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml +# files from -docker +rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml %endif sed -i "s|%{buildroot}||" *.list @@ -626,8 +630,7 @@ bastion hosts, and a basic dashboard. %endif -%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x -%if 0%{?fedora} +%if 0%{?build_docker} %package -n cockpit-docker Summary: Cockpit user interface for Docker containers Requires: cockpit-bridge >= 122 @@ -640,8 +643,7 @@ The Cockpit components for interacting with Docker and user interface. This package is not yet complete. %files -n cockpit-docker -f docker.list - -%endif +%{_datadir}/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml %endif %package -n cockpit-packagekit @@ -660,6 +662,13 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Feb 19 2020 Marius Vollmer - 213-1 + +- Inline documentation +- Support for transient virtual machines +- UEFI for virtual machines +- Unattended virtual machines installation + * Wed Feb 05 2020 sanne raymaekers - 212-1 - Per page documentation diff --git a/sources b/sources index 1153db7..8053807 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-212.tar.xz) = 6aa8dde69c3a05a9a9fe9fca6abcfbe27ff6c911bcd141d43eae4c1727b2e36afc48e3d8675792bd31ccf087eaa33596672499fbd4dd0f84f5ac0fd7eef235a8 +SHA512 (cockpit-213.tar.xz) = ea3b13c6bccb9998272b393ea76ac32c743935cb4c631736937b103cdb325b0f34750ae2a980366994fab3cb21d3fca2acfd04e18d185bb684ef962d7cdaed97