Update to 173-1
- Storage: Offer installation of VDO - Machines: Add disks to a virtual machine
This commit is contained in:
Cockpit Project
parent
68ea01213b
commit
d7544c8b68
1
.gitignore
vendored
1
.gitignore
vendored
@ -131,3 +131,4 @@
|
||||
/cockpit-168.tar.xz
|
||||
/cockpit-170.tar.xz
|
||||
/cockpit-171.tar.xz
|
||||
/cockpit-173.tar.xz
|
||||
|
||||
154
cockpit.spec
154
cockpit.spec
@ -1,6 +1,6 @@
|
||||
# This spec file has been automatically updated
|
||||
Version: 171
|
||||
Release: 2%{?dist}
|
||||
Version: 173
|
||||
Release: 1%{?dist}
|
||||
#
|
||||
# This file is maintained at the following location:
|
||||
# https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
|
||||
@ -59,6 +59,10 @@ Release: 2%{?dist}
|
||||
%global go_scl_prefix %{nil}
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} >= 7 || 0%{?centos}
|
||||
%define vdo_on_demand 1
|
||||
%endif
|
||||
|
||||
Name: cockpit
|
||||
Summary: A user interface for Linux servers
|
||||
|
||||
@ -80,9 +84,9 @@ BuildRequires: pam-devel
|
||||
BuildRequires: autoconf automake
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
BuildRequires: /usr/bin/python3
|
||||
%endif
|
||||
# FIXME: tools/ is not completely ported to Python 3 yet
|
||||
%else
|
||||
BuildRequires: /usr/bin/python2
|
||||
%endif
|
||||
BuildRequires: intltool
|
||||
%if %{defined build_dashboard}
|
||||
BuildRequires: libssh-devel >= %{libssh_version}
|
||||
@ -108,28 +112,27 @@ BuildRequires: xmlto
|
||||
# This is the "cockpit" metapackage. It should only
|
||||
# Require, Suggest or Recommend other cockpit-xxx subpackages
|
||||
|
||||
Requires: cockpit-bridge = %{version}-%{release}
|
||||
Requires: cockpit-ws = %{version}-%{release}
|
||||
Requires: cockpit-system = %{version}-%{release}
|
||||
Requires: cockpit-bridge
|
||||
Requires: cockpit-ws
|
||||
Requires: cockpit-system
|
||||
|
||||
# Optional components (for f24 we use soft deps)
|
||||
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
|
||||
%if 0%{?rhel} == 0
|
||||
Recommends: cockpit-dashboard = %{version}-%{release}
|
||||
Recommends: cockpit-dashboard
|
||||
%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
|
||||
Recommends: (cockpit-docker if /usr/bin/docker)
|
||||
%endif
|
||||
Recommends: (cockpit-networkmanager = %{version}-%{release} if NetworkManager)
|
||||
Recommends: (cockpit-storaged = %{version}-%{release} if udisks2)
|
||||
Recommends: (cockpit-packagekit = %{version}-%{release} if PackageKit)
|
||||
%endif
|
||||
Recommends: (cockpit-networkmanager if NetworkManager)
|
||||
Recommends: (cockpit-storaged if udisks2)
|
||||
Recommends: cockpit-packagekit
|
||||
%if 0%{?rhel} >= 8
|
||||
Recommends: subscription-manager-cockpit
|
||||
%endif
|
||||
%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
|
||||
Recommends: (cockpit-docker = %{version}-%{release} if /usr/bin/docker)
|
||||
%endif
|
||||
Suggests: cockpit-pcp = %{version}-%{release}
|
||||
Suggests: cockpit-kubernetes = %{version}-%{release}
|
||||
Suggests: cockpit-selinux = %{version}-%{release}
|
||||
Suggests: cockpit-packagekit = %{version}-%{release}
|
||||
Suggests: cockpit-pcp
|
||||
Suggests: cockpit-kubernetes
|
||||
Suggests: cockpit-selinux
|
||||
%endif
|
||||
|
||||
%prep
|
||||
@ -157,7 +160,8 @@ exec 2>&1
|
||||
--with-selinux-config-type=etc_t \
|
||||
%{?rhel:--without-storaged-iscsi-sessions} \
|
||||
--with-appstream-data-packages='[ "appstream-data" ]' \
|
||||
--with-nfs-client-package='"nfs-utils"'
|
||||
--with-nfs-client-package='"nfs-utils"' \
|
||||
%{?vdo_on_demand:--with-vdo-package='"vdo"'}
|
||||
make -j4 %{?extra_flags} all
|
||||
|
||||
%check
|
||||
@ -259,12 +263,17 @@ find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list
|
||||
%endif
|
||||
|
||||
%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
|
||||
%if 0%{?fedora} || 0%{?rhel} < 8
|
||||
echo '%dir %{_datadir}/cockpit/docker' > docker.list
|
||||
find %{buildroot}%{_datadir}/cockpit/docker -type f >> docker.list
|
||||
%else
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/docker
|
||||
touch docker.list
|
||||
%endif
|
||||
%else
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/docker
|
||||
touch docker.list
|
||||
%endif
|
||||
|
||||
%ifarch aarch64 x86_64 ppc64le s390x
|
||||
%if %{defined wip}
|
||||
@ -283,7 +292,7 @@ touch kubernetes.list
|
||||
|
||||
# when not building basic packages, remove their files
|
||||
%if 0%{?build_basic} == 0
|
||||
for pkg in base1 branding motd kdump networkmanager realmd selinux shell sosreport ssh static storaged systemd tuned users; do
|
||||
for pkg in base1 branding motd kdump networkmanager realmd selinux shell sosreport ssh static systemd tuned users; do
|
||||
rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
|
||||
done
|
||||
for data in applications doc locale man metainfo pixmaps; do
|
||||
@ -302,7 +311,7 @@ rm -f %{buildroot}%{_libexecdir}/cockpit-ssh
|
||||
|
||||
# when not building optional packages, remove their files
|
||||
%if 0%{?build_optional} == 0
|
||||
for pkg in apps dashboard docker kubernetes machines ostree ovirt packagekit pcp playground; do
|
||||
for pkg in apps dashboard docker kubernetes machines ostree ovirt packagekit pcp playground storaged; do
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
|
||||
done
|
||||
# files from -tests
|
||||
@ -326,8 +335,13 @@ rm -rf %{buildroot}/usr/src/debug
|
||||
# On RHEL kdump, networkmanager, selinux, and sosreport are part of the system package
|
||||
%if 0%{?rhel}
|
||||
cat kdump.list sosreport.list networkmanager.list selinux.list >> system.list
|
||||
rm -f %{buildroot}/usr/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
|
||||
rm -f %{buildroot}/usr/share/pixmaps/cockpit-sosreport.png
|
||||
rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
|
||||
rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml
|
||||
rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}%{?centos}
|
||||
rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml
|
||||
%endif
|
||||
|
||||
%if 0%{?build_basic}
|
||||
@ -405,44 +419,6 @@ embed or extend Cockpit.
|
||||
%exclude %{_docdir}/cockpit/README.md
|
||||
%{_docdir}/cockpit
|
||||
|
||||
# storaged on Fedora < 27, udisks on newer ones
|
||||
# Recommends: not supported in RHEL <= 7
|
||||
%package storaged
|
||||
Summary: Cockpit user interface for storage, using udisks
|
||||
Requires: cockpit-shell >= 122
|
||||
%if 0%{?rhel} == 7 || 0%{?centos} == 7
|
||||
Requires: udisks2 >= 2.6
|
||||
Requires: udisks2-lvm2 >= 2.6
|
||||
Requires: udisks2-iscsi >= 2.6
|
||||
Requires: device-mapper-multipath
|
||||
%else
|
||||
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
|
||||
Requires: udisks2 >= 2.6
|
||||
Recommends: udisks2-lvm2 >= 2.6
|
||||
Recommends: udisks2-iscsi >= 2.6
|
||||
Recommends: device-mapper-multipath
|
||||
%else
|
||||
# Fedora < 27
|
||||
Requires: storaged >= 2.1.1
|
||||
Recommends: storaged-lvm2 >= 2.1.1
|
||||
Recommends: storaged-iscsi >= 2.1.1
|
||||
Recommends: device-mapper-multipath
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
Requires: python3
|
||||
Requires: python3-dbus
|
||||
%else
|
||||
Requires: python
|
||||
Requires: python-dbus
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
|
||||
%description storaged
|
||||
The Cockpit component for managing storage. This package uses udisks.
|
||||
|
||||
%files storaged -f storaged.list
|
||||
|
||||
%package system
|
||||
Summary: Cockpit admin interface package for configuring and troubleshooting a system
|
||||
BuildArch: noarch
|
||||
@ -555,6 +531,7 @@ BuildArch: noarch
|
||||
The Cockpit component for configuring kernel crash dumping.
|
||||
|
||||
%files kdump -f kdump.list
|
||||
%{_datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml
|
||||
|
||||
%package sosreport
|
||||
Summary: Cockpit user interface for diagnostic reports
|
||||
@ -568,8 +545,8 @@ The Cockpit component for creating diagnostic reports with the
|
||||
sosreport tool.
|
||||
|
||||
%files sosreport -f sosreport.list
|
||||
/usr/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
|
||||
/usr/share/pixmaps/cockpit-sosreport.png
|
||||
%{_datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
|
||||
%{_datadir}/pixmaps/cockpit-sosreport.png
|
||||
|
||||
%package networkmanager
|
||||
Summary: Cockpit user interface for networking, using NetworkManager
|
||||
@ -596,7 +573,7 @@ Summary: Cockpit SELinux package
|
||||
Requires: cockpit-bridge >= 122
|
||||
Requires: cockpit-shell >= 122
|
||||
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
|
||||
Recommends: setroubleshoot-server >= 3.3.3
|
||||
Requires: setroubleshoot-server >= 3.3.3
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
|
||||
@ -605,6 +582,7 @@ This package contains the Cockpit user interface integration with the
|
||||
utility setroubleshoot to diagnose and resolve SELinux issues.
|
||||
|
||||
%files selinux -f selinux.list
|
||||
%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml
|
||||
|
||||
%endif
|
||||
|
||||
@ -621,6 +599,45 @@ Dummy package from building optional packages only; never install or publish me.
|
||||
|
||||
%if 0%{?build_optional}
|
||||
|
||||
# storaged on Fedora < 27, udisks on newer ones
|
||||
# Recommends: not supported in RHEL <= 7
|
||||
%package -n cockpit-storaged
|
||||
Summary: Cockpit user interface for storage, using udisks
|
||||
Requires: cockpit-shell >= 122
|
||||
%if 0%{?rhel} == 7 || 0%{?centos} == 7
|
||||
Requires: udisks2 >= 2.6
|
||||
Requires: udisks2-lvm2 >= 2.6
|
||||
Requires: udisks2-iscsi >= 2.6
|
||||
Requires: device-mapper-multipath
|
||||
%else
|
||||
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
|
||||
Requires: udisks2 >= 2.6
|
||||
Recommends: udisks2-lvm2 >= 2.6
|
||||
Recommends: udisks2-iscsi >= 2.6
|
||||
Recommends: device-mapper-multipath
|
||||
%else
|
||||
# Fedora < 27
|
||||
Requires: storaged >= 2.1.1
|
||||
Recommends: storaged-lvm2 >= 2.1.1
|
||||
Recommends: storaged-iscsi >= 2.1.1
|
||||
Recommends: device-mapper-multipath
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
Requires: python3
|
||||
Requires: python3-dbus
|
||||
%else
|
||||
Requires: python
|
||||
Requires: python-dbus
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n cockpit-storaged
|
||||
The Cockpit component for managing storage. This package uses udisks.
|
||||
|
||||
%files -n cockpit-storaged -f storaged.list
|
||||
|
||||
|
||||
%package -n cockpit-tests
|
||||
Summary: Tests for Cockpit
|
||||
Requires: cockpit-bridge >= 138
|
||||
@ -733,13 +750,14 @@ bastion hosts, and a basic dashboard.
|
||||
|
||||
%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} < 8
|
||||
%package -n cockpit-docker
|
||||
Summary: Cockpit user interface for Docker containers
|
||||
Requires: cockpit-bridge >= 122
|
||||
Requires: cockpit-shell >= 122
|
||||
Requires: /usr/bin/docker
|
||||
Requires: /usr/lib/systemd/system/docker.service
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
%if 0%{?fedora}
|
||||
Requires: python3
|
||||
%else
|
||||
Requires: python2
|
||||
@ -751,6 +769,7 @@ This package is not yet complete.
|
||||
|
||||
%files -n cockpit-docker -f docker.list
|
||||
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%ifarch aarch64 x86_64 ppc64le s390x
|
||||
@ -795,6 +814,11 @@ via PackageKit.
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Wed Jul 25 2018 Martin Pitt <martin@piware.de> - 173-1
|
||||
|
||||
- Storage: Offer installation of VDO
|
||||
- Machines: Add disks to a virtual machine
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 171-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cockpit-171.tar.xz) = eeefffeaf070d356571d6503a96fc552fe63edee4d325f4ac0dfce32e12147696cb67f42d4f2cb94437f6d66a6adf74a908b24ad46dfae0453cdbce5712bc1df
|
||||
SHA512 (cockpit-173.tar.xz) = 07e59f187d7431f6e3e232d07593cca7d061745394b946927ce819e2de77dc70ed0cf78887ce06920a36d3c1b8650c950049028c913f22464921d6650d01a3e5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user