Update to version 0.92
* OAuth login support * Update Patternfly * Log to stderr when no journal * Make sosreport work on RHEL and Atomic
This commit is contained in:
parent
abb73c3914
commit
8d7aaa0114
1
.gitignore
vendored
1
.gitignore
vendored
@ -69,3 +69,4 @@
|
|||||||
/cockpit-0.89.tar.bz2
|
/cockpit-0.89.tar.bz2
|
||||||
/cockpit-0.90.tar.bz2
|
/cockpit-0.90.tar.bz2
|
||||||
/cockpit-0.91.tar.xz
|
/cockpit-0.91.tar.xz
|
||||||
|
/cockpit-0.92.tar.xz
|
||||||
|
64
cockpit.spec
64
cockpit.spec
@ -1,4 +1,4 @@
|
|||||||
%define tag 0.91
|
%define tag 0.92
|
||||||
%define rev 1
|
%define rev 1
|
||||||
#
|
#
|
||||||
# This file is maintained at the following location:
|
# This file is maintained at the following location:
|
||||||
@ -11,7 +11,7 @@
|
|||||||
#
|
#
|
||||||
# Globals that may be defined elsewhere
|
# Globals that may be defined elsewhere
|
||||||
# * gitcommit xxxx
|
# * gitcommit xxxx
|
||||||
# * tag 0.71
|
# * tag 0.91
|
||||||
#
|
#
|
||||||
|
|
||||||
%define branding auto
|
%define branding auto
|
||||||
@ -186,7 +186,7 @@ rm -rf %{buildroot}%{_datadir}/%{name}/registry
|
|||||||
|
|
||||||
# On RHEL we don't yet show options for changing language
|
# On RHEL we don't yet show options for changing language
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
echo '{ "linguas": null }' > %{buildroot}%{_datadir}/%{name}/shell/override.json
|
echo '{ "linguas": null, "machine-limit": 5 }' > %{buildroot}%{_datadir}/%{name}/shell/override.json
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Build the package lists for resource packages
|
# Build the package lists for resource packages
|
||||||
@ -250,9 +250,9 @@ sed -i "s|%{buildroot}/usr/src/debug||" debug.list
|
|||||||
tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
|
tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
|
||||||
rm -rf %{buildroot}/usr/src/debug
|
rm -rf %{buildroot}/usr/src/debug
|
||||||
|
|
||||||
# On RHEL subscriptions, networkmanager, and docker are part of the shell package
|
# On RHEL subscriptions, networkmanager, and sosreport are part of the shell package
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
cat subscriptions.list docker.list networkmanager.list >> shell.list
|
cat subscriptions.list sosreport.list networkmanager.list >> shell.list
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Only strip out debug info in non wip builds
|
# Only strip out debug info in non wip builds
|
||||||
@ -362,17 +362,6 @@ This package contains the Cockpit shell UI assets.
|
|||||||
|
|
||||||
%files shell -f shell.list
|
%files shell -f shell.list
|
||||||
|
|
||||||
%package sosreport
|
|
||||||
Summary: Cockpit user interface for diagnostic reports
|
|
||||||
Requires: sos
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description sosreport
|
|
||||||
The Cockpit component for creating diagnostic reports with the
|
|
||||||
sosreport tool.
|
|
||||||
|
|
||||||
%files sosreport -f sosreport.list
|
|
||||||
|
|
||||||
%package storaged
|
%package storaged
|
||||||
Summary: Cockpit user interface for storage, using Storaged
|
Summary: Cockpit user interface for storage, using Storaged
|
||||||
Requires: storaged >= 2.1.1
|
Requires: storaged >= 2.1.1
|
||||||
@ -385,10 +374,34 @@ The Cockpit component for managing storage. This package uses Storaged.
|
|||||||
|
|
||||||
%files storaged -f storaged.list
|
%files storaged -f storaged.list
|
||||||
|
|
||||||
|
%package ostree
|
||||||
|
Summary: Cockpit user interface for rpm-ostree
|
||||||
|
%if 0%{?rhel}
|
||||||
|
Requires: rpm-ostree-client >= 2015.11-1
|
||||||
|
%else
|
||||||
|
Requires: rpm-ostree >= 2015.10-1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description ostree
|
||||||
|
The Cockpit components for managing software updates for ostree based systems.
|
||||||
|
|
||||||
|
%files ostree -f ostree.list
|
||||||
|
|
||||||
# Conditionally built packages below
|
# Conditionally built packages below
|
||||||
|
|
||||||
%if 0%{?rhel} == 0
|
%if 0%{?rhel} == 0
|
||||||
|
|
||||||
|
%package sosreport
|
||||||
|
Summary: Cockpit user interface for diagnostic reports
|
||||||
|
Requires: sos
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description sosreport
|
||||||
|
The Cockpit component for creating diagnostic reports with the
|
||||||
|
sosreport tool.
|
||||||
|
|
||||||
|
%files sosreport -f sosreport.list
|
||||||
|
|
||||||
%package subscriptions
|
%package subscriptions
|
||||||
Summary: Cockpit subscription user interface package
|
Summary: Cockpit subscription user interface package
|
||||||
Requires: subscription-manager >= 1.13
|
Requires: subscription-manager >= 1.13
|
||||||
@ -410,6 +423,8 @@ The Cockpit component for managing networking. This package uses NetworkManager
|
|||||||
|
|
||||||
%files networkmanager -f networkmanager.list
|
%files networkmanager -f networkmanager.list
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
%ifarch x86_64 armv7hl
|
%ifarch x86_64 armv7hl
|
||||||
|
|
||||||
%package docker
|
%package docker
|
||||||
@ -424,8 +439,6 @@ This package is not yet complete.
|
|||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
|
|
||||||
%package kubernetes
|
%package kubernetes
|
||||||
@ -440,15 +453,6 @@ cluster. Installed on the Kubernetes master. This package is not yet complete.
|
|||||||
|
|
||||||
%endif
|
%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}
|
%if %{defined gitcommit}
|
||||||
|
|
||||||
%package test-assets
|
%package test-assets
|
||||||
@ -468,6 +472,12 @@ pulls in some necessary packages via dependencies.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 20 2016 Stef Walter <stefw@redhat.com> - 0.92-1
|
||||||
|
- * OAuth login support
|
||||||
|
- * Update Patternfly
|
||||||
|
- * Log to stderr when no journal
|
||||||
|
- * Make sosreport work on RHEL and Atomic
|
||||||
|
|
||||||
* Thu Jan 14 2016 Stef Walter <stefw@redhat.com> - 0.91-1
|
* Thu Jan 14 2016 Stef Walter <stefw@redhat.com> - 0.91-1
|
||||||
- * Fix computing of graph samples on 32-bit OS
|
- * Fix computing of graph samples on 32-bit OS
|
||||||
- * Distribute licenses of included components
|
- * Distribute licenses of included components
|
||||||
|
Loading…
Reference in New Issue
Block a user