Update to 187-1
- Machines: More operations for Storage Pools - Domains: More information about the joined domain - Storage: The options for VDO volumes are explained - Machines: Support for oVirt will be dropped in the future
This commit is contained in:
parent
185bc8fd0d
commit
4b17fcf2f8
1
.gitignore
vendored
1
.gitignore
vendored
@ -143,3 +143,4 @@
|
||||
/cockpit-183.tar.xz
|
||||
/cockpit-184.tar.xz
|
||||
/cockpit-185.tar.xz
|
||||
/cockpit-187.tar.xz
|
||||
|
29
cockpit.spec
29
cockpit.spec
@ -1,6 +1,6 @@
|
||||
# This spec file has been automatically updated
|
||||
Version: 185
|
||||
Release: 3%{?dist}
|
||||
Version: 187
|
||||
Release: 1%{?dist}
|
||||
#
|
||||
# This file is maintained at the following location:
|
||||
# https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
|
||||
@ -66,6 +66,11 @@ Release: 3%{?dist}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# cockpit-machines-ovirt is RHEL 7 and Fedora < 30 only
|
||||
%if (0%{?fedora} && 0%{?fedora} < 30) || (0%{?rhel} >= 7 && 0%{?rhel} < 8)
|
||||
%define build_ovirt 1
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} >= 8
|
||||
%global go_scl_prefix go-toolset-7-
|
||||
%else
|
||||
@ -269,8 +274,13 @@ find %{buildroot}%{_datadir}/cockpit/apps -type f >> packagekit.list
|
||||
echo '%dir %{_datadir}/cockpit/machines' > machines.list
|
||||
find %{buildroot}%{_datadir}/cockpit/machines -type f >> machines.list
|
||||
|
||||
%if 0%{?build_ovirt}
|
||||
echo '%dir %{_datadir}/cockpit/ovirt' > ovirt.list
|
||||
find %{buildroot}%{_datadir}/cockpit/ovirt -type f >> ovirt.list
|
||||
%else
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/ovirt
|
||||
touch ovirt.list
|
||||
%endif
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/selinux' > selinux.list
|
||||
find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list
|
||||
@ -478,7 +488,7 @@ Requires: subscription-manager >= 1.13
|
||||
%endif
|
||||
# NPM modules which are also available as packages
|
||||
Provides: bundled(js-jquery) = 3.3.1
|
||||
Provides: bundled(js-moment) = 2.23.0
|
||||
Provides: bundled(js-moment) = 2.24.0
|
||||
Provides: bundled(nodejs-flot) = 0.8.3
|
||||
Provides: bundled(nodejs-promise) = 8.0.2
|
||||
Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.8.0
|
||||
@ -540,7 +550,7 @@ The Cockpit Web Service listens on the network, and authenticates users.
|
||||
|
||||
%pre ws
|
||||
getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws
|
||||
getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d / -s /sbin/nologin -c "User for cockpit-ws" cockpit-ws
|
||||
getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws" cockpit-ws
|
||||
|
||||
%post ws
|
||||
%systemd_post cockpit.socket
|
||||
@ -706,6 +716,8 @@ If "virt-install" is installed, you can also create new virtual machines.
|
||||
%files -n cockpit-machines -f machines.list
|
||||
%{_datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml
|
||||
|
||||
%if 0%{?build_ovirt}
|
||||
|
||||
%package -n cockpit-machines-ovirt
|
||||
BuildArch: noarch
|
||||
Summary: Cockpit user interface for oVirt virtual machines
|
||||
@ -723,6 +735,8 @@ The Cockpit components for managing oVirt virtual machines.
|
||||
|
||||
%files -n cockpit-machines-ovirt -f ovirt.list
|
||||
|
||||
%endif
|
||||
|
||||
%package -n cockpit-pcp
|
||||
Summary: Cockpit PCP integration
|
||||
Requires: cockpit-bridge >= 134.x
|
||||
@ -830,6 +844,13 @@ via PackageKit.
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Wed Feb 06 2019 Marius Vollmer <mvollmer@redhat.com> - 187-1
|
||||
|
||||
- Machines: More operations for Storage Pools
|
||||
- Domains: More information about the joined domain
|
||||
- Storage: The options for VDO volumes are explained
|
||||
- Machines: Support for oVirt will be dropped in the future
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 185-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cockpit-185.tar.xz) = 25c1e0de50196a62aade443d50bbce1a77bf5c74360282b886cc62bec57559c8808cd5fb29bf9d017dabd54e7182b7a69879c9c85f721fa65237e8331e58f000
|
||||
SHA512 (cockpit-187.tar.xz) = 15fb7f6d04c879c3e32e52bfea1e7bf5563e84fa51e0907a87c8d64e4a69212b18406bb5d02f44d759efae09f297efdaac09356f735eda5dcdc80cc5053dd185
|
||||
|
Loading…
Reference in New Issue
Block a user