diff --git a/.gitignore b/.gitignore index b0b64c4..8f03cc5 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ /cockpit-0.107.tar.xz /cockpit-0.108.tar.xz /cockpit-0.109.tar.xz +/cockpit-0.111.tar.xz diff --git a/cockpit.spec b/cockpit.spec index 4054768..4bbc64c 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,4 +1,4 @@ -%define tag 0.109 +%define tag 0.111 %define rev 1 # # This file is maintained at the following location: @@ -73,12 +73,6 @@ BuildRequires: pcp-libs-devel BuildRequires: gdb %if %{defined gitcommit} -# on fedora 24, nodejs provides npm -%if 0%{?fedora} > 0 && 0%{?fedora} < 24 -BuildRequires: npm -%endif -BuildRequires: nodejs -# For kerberos tests BuildRequires: krb5-server %endif @@ -186,8 +180,8 @@ echo '{ "linguas": null, "machine-limit": 5 }' > %{buildroot}%{_datadir}/%{name} %endif # Build the package lists for resource packages -echo '%dir %{_datadir}/%{name}/base1' > shell.list -find %{buildroot}%{_datadir}/%{name}/base1 -type f >> shell.list +echo '%dir %{_datadir}/%{name}/base1' > base.list +find %{buildroot}%{_datadir}/%{name}/base1 -type f >> base.list echo '%dir %{_datadir}/%{name}/dashboard' >> shell.list find %{buildroot}%{_datadir}/%{name}/dashboard -type f >> shell.list @@ -290,7 +284,7 @@ cat subscriptions.list sosreport.list networkmanager.list >> shell.list %{_datadir}/pixmaps/cockpit.png %doc %{_mandir}/man1/cockpit.1.gz -%files bridge +%files bridge -f base.list %doc %{_mandir}/man1/cockpit-bridge.1.gz %{_bindir}/cockpit-bridge %attr(4755, -, -) %{_libexecdir}/cockpit-polkit @@ -379,9 +373,15 @@ This package contains the Cockpit shell UI assets. Summary: Cockpit user interface for storage, using Storaged Requires: %{name}-shell = %{version}-%{release} Requires: storaged >= 2.1.1 +%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 +Recommends: storaged-lvm2 >= 2.1.1 +Recommends: storaged-iscsi >= 2.1.1 +Recommends: device-mapper-multipath +%else Requires: storaged-lvm2 >= 2.1.1 Requires: storaged-iscsi >= 2.1.1 Requires: device-mapper-multipath +%endif BuildArch: noarch %description storaged @@ -508,6 +508,12 @@ pulls in some necessary packages via dependencies. %endif %changelog +* Tue Jun 21 2016 Stef Walter - 0.111-1 +- * Tarball build issue in 0.110 is now fixed +- * The Containers page layouts have been tweaked +- * Make the Containers resource limits work again +- * Registry image now have layers displayed correctly + * Thu Jun 02 2016 Dominik Perpeet - 0.109-1 - * API stabilization, structural cleanup - * SELinux Troubleshooting: documentation, support latest API diff --git a/sources b/sources index a1f76b4..1cfe0da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d52d105eaa1d7761266a1288dd0fc26 cockpit-0.109.tar.xz +d89d8cf2e14525d5000abf938ebeec3d cockpit-0.111.tar.xz