Update to 168-1
- Improve checks for root privilege availability
This commit is contained in:
parent
6189b30d9b
commit
08af912579
1
.gitignore
vendored
1
.gitignore
vendored
@ -128,3 +128,4 @@
|
|||||||
/cockpit-165.tar.xz
|
/cockpit-165.tar.xz
|
||||||
/cockpit-166.tar.xz
|
/cockpit-166.tar.xz
|
||||||
/cockpit-167.tar.xz
|
/cockpit-167.tar.xz
|
||||||
|
/cockpit-168.tar.xz
|
||||||
|
24
cockpit.spec
24
cockpit.spec
@ -1,5 +1,5 @@
|
|||||||
# This spec file has been automatically updated
|
# This spec file has been automatically updated
|
||||||
Version: 167
|
Version: 168
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
#
|
#
|
||||||
# This file is maintained at the following location:
|
# This file is maintained at the following location:
|
||||||
@ -63,7 +63,7 @@ Name: cockpit
|
|||||||
Summary: A user interface for Linux servers
|
Summary: A user interface for Linux servers
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://cockpit-project.org/
|
URL: https://cockpit-project.org/
|
||||||
|
|
||||||
%if %{defined wip}
|
%if %{defined wip}
|
||||||
Source0: cockpit-%{version}.tar.gz
|
Source0: cockpit-%{version}.tar.gz
|
||||||
@ -112,6 +112,7 @@ Requires: %{name}-system = %{version}-%{release}
|
|||||||
Recommends: %{name}-dashboard = %{version}-%{release}
|
Recommends: %{name}-dashboard = %{version}-%{release}
|
||||||
Recommends: (%{name}-networkmanager = %{version}-%{release} if NetworkManager)
|
Recommends: (%{name}-networkmanager = %{version}-%{release} if NetworkManager)
|
||||||
Recommends: (%{name}-storaged = %{version}-%{release} if udisks2)
|
Recommends: (%{name}-storaged = %{version}-%{release} if udisks2)
|
||||||
|
Recommends: (%{name}-packagekit = %{version}-%{release} if PackageKit)
|
||||||
%if 0%{?rhel} >= 8
|
%if 0%{?rhel} >= 8
|
||||||
Recommends: subscription-manager-cockpit
|
Recommends: subscription-manager-cockpit
|
||||||
%endif
|
%endif
|
||||||
@ -390,18 +391,12 @@ embed or extend Cockpit.
|
|||||||
%exclude %{_docdir}/%{name}/README.md
|
%exclude %{_docdir}/%{name}/README.md
|
||||||
%{_docdir}/%{name}
|
%{_docdir}/%{name}
|
||||||
|
|
||||||
# storaged on RHEL 7.4 and Fedora < 27, udisks on newer ones
|
# storaged on Fedora < 27, udisks on newer ones
|
||||||
# Recommends: not supported in RHEL < 8
|
# Recommends: not supported in RHEL < 8
|
||||||
%package storaged
|
%package storaged
|
||||||
Summary: Cockpit user interface for storage, using Storaged
|
Summary: Cockpit user interface for storage, using udisks
|
||||||
Requires: %{name}-shell >= 122
|
Requires: %{name}-shell >= 122
|
||||||
%if (0%{?rhel} == 7 && "%{os_version_id}" == "7.4") || 0%{?centos} == 7
|
%if 0%{?rhel} == 7 || 0%{?centos} == 7
|
||||||
Requires: storaged >= 2.1.1
|
|
||||||
Requires: storaged-lvm2 >= 2.1.1
|
|
||||||
Requires: storaged-iscsi >= 2.1.1
|
|
||||||
Requires: device-mapper-multipath
|
|
||||||
%else
|
|
||||||
%if 0%{?rhel} == 7
|
|
||||||
Requires: udisks2 >= 2.6
|
Requires: udisks2 >= 2.6
|
||||||
Requires: udisks2-lvm2 >= 2.6
|
Requires: udisks2-lvm2 >= 2.6
|
||||||
Requires: udisks2-iscsi >= 2.6
|
Requires: udisks2-iscsi >= 2.6
|
||||||
@ -420,7 +415,6 @@ Recommends: storaged-iscsi >= 2.1.1
|
|||||||
Recommends: device-mapper-multipath
|
Recommends: device-mapper-multipath
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%endif
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||||
Requires: python3
|
Requires: python3
|
||||||
Requires: python3-dbus
|
Requires: python3-dbus
|
||||||
@ -431,7 +425,7 @@ Requires: python-dbus
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description storaged
|
%description storaged
|
||||||
The Cockpit component for managing storage. This package uses Storaged.
|
The Cockpit component for managing storage. This package uses udisks.
|
||||||
|
|
||||||
%files storaged -f storaged.list
|
%files storaged -f storaged.list
|
||||||
|
|
||||||
@ -776,6 +770,10 @@ via PackageKit.
|
|||||||
|
|
||||||
# The changelog is automatically generated and merged
|
# The changelog is automatically generated and merged
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 16 2018 Martin Pitt <martin@piware.de> - 168-1
|
||||||
|
|
||||||
|
- Improve checks for root privilege availability
|
||||||
|
|
||||||
* Wed May 02 2018 Martin Pitt <martin@piware.de> - 167-1
|
* Wed May 02 2018 Martin Pitt <martin@piware.de> - 167-1
|
||||||
|
|
||||||
- Networking: Add Firewall Configuration
|
- Networking: Add Firewall Configuration
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (cockpit-167.tar.xz) = e2a3be33c953f3e5418c85c3a9f28e1522fded671ab9feb675b322a40af83fd04fc57d86594ad7e73d94e334b7bce22e602d2e23fb9a5fbeea70d03cec67942f
|
SHA512 (cockpit-168.tar.xz) = 8fd3cbdd99610d5d6b38fbf3d55125f05b6afe44affece149f185ceb558d502109338ee8ae8725be752fbca28bde860cbffd0fa958bf40e0f135950c6349460f
|
||||||
|
Loading…
Reference in New Issue
Block a user