diff --git a/.gitignore b/.gitignore index 7f5687b..4f8b738 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /cockpit-0.84.tar.bz2 /cockpit-0.86.tar.bz2 /cockpit-0.87.tar.bz2 +/cockpit-0.88.tar.bz2 diff --git a/cockpit.spec b/cockpit.spec index 5ec3cf9..3a2bdbf 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,4 +1,4 @@ -%define tag 0.87 +%define tag 0.88 %define rev 1 # # This file is maintained at the following location: @@ -208,6 +208,9 @@ find %{buildroot}%{_datadir}/%{name}/storage -type f >> storaged.list echo '%dir %{_datadir}/%{name}/network' > networkmanager.list find %{buildroot}%{_datadir}/%{name}/network -type f >> networkmanager.list +echo '%dir %{_datadir}/%{name}/ostree' > ostree.list +find %{buildroot}%{_datadir}/%{name}/ostree -type f >> ostree.list + %ifarch x86_64 armv7hl echo '%dir %{_datadir}/%{name}/docker' > docker.list find %{buildroot}%{_datadir}/%{name}/docker -type f >> docker.list @@ -255,9 +258,9 @@ cat subscriptions.list docker.list networkmanager.list >> shell.list %{_docdir}/%{name}/COPYING %{_docdir}/%{name}/README.md %dir %{_datadir}/%{name} -%{_datadir}/appdata -%{_datadir}/applications -%{_datadir}/pixmaps +%{_datadir}/appdata/cockpit.appdata.xml +%{_datadir}/applications/cockpit.desktop +%{_datadir}/pixmaps/cockpit.png %doc %{_mandir}/man1/cockpit.1.gz %files bridge @@ -297,6 +300,7 @@ cat subscriptions.list docker.list networkmanager.list >> shell.list %{_sbindir}/remotectl %{_libdir}/security/pam_ssh_add.so %{_libexecdir}/cockpit-ws +%{_libexecdir}/cockpit-stub %attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session %attr(775, -, wheel) %{_localstatedir}/lib/%{name} %{_datadir}/%{name}/static @@ -421,6 +425,15 @@ cluster. Installed on the Kubernetes master. This package is not yet complete. %endif +%package ostree +Summary: Cockpit user interface for rpm-ostree +Requires: rpm-ostree >= 2015.10-1 + +%description ostree +The Cockpit components for managing software updates for ostree based systems. + +%files ostree -f ostree.list + %if %{defined gitcommit} %package test-assets @@ -441,6 +454,14 @@ pulls in some necessary packages via dependencies. %endif %changelog +* Fri Dec 18 2015 Stef Walter - 0.88-1 +- * User interface for OSTree upgrades and rollbacks +- * General reusable purpose angular kubernetes client code +- * Allow custom login scripts for handling authentication +- * A specific dashboards can now be the default destination after login +- * Kill ssh-agent correctly when launched by cockpit-bridge +- * Add a new cockpit-stub bridge for non-local access + * Thu Dec 10 2015 Stef Walter - 0.87-1 - * Fix login on Windows, don't prompt for additional auth - * Use the machine host name in the default self-signed certificate diff --git a/sources b/sources index abde623..d8950a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13c4be1d25ea95b5639c196c884ed6c0 cockpit-0.87.tar.bz2 +71137bc22cbff8ad4e0225d7f0130b68 cockpit-0.88.tar.bz2