Update to 163-1
- Drop "Transfer data asynchronously" VDO option on Storage page - Hide Docker storage pool reset button when it cannot work properly - Update jQuery to version 3.3.1 (deprecated cockpit API!)
This commit is contained in:
Cockpit Project
parent
07a3932cf6
commit
388c6a7f4f
1
.gitignore
vendored
1
.gitignore
vendored
@ -123,3 +123,4 @@
|
||||
/cockpit-159.tar.xz
|
||||
/cockpit-160.tar.xz
|
||||
/cockpit-161.tar.xz
|
||||
/cockpit-163.tar.xz
|
||||
|
||||
77
cockpit.spec
77
cockpit.spec
@ -1,6 +1,6 @@
|
||||
# This spec file has been automatically updated
|
||||
Version: 161
|
||||
Release: 2%{?dist}
|
||||
Version: 163
|
||||
Release: 1%{?dist}
|
||||
#
|
||||
# This file is maintained at the following location:
|
||||
# https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
|
||||
@ -34,6 +34,13 @@ Release: 2%{?dist}
|
||||
# define to build the dashboard
|
||||
%define build_dashboard 1
|
||||
|
||||
# on RHEL 7.x we build subscriptions; superseded in RHEL 8 (and Fedora) by
|
||||
# external subscription-manager-cockpit
|
||||
%if 0%{?rhel} >= 7 && 0%{?rhel} < 8
|
||||
%define build_subscriptions 1
|
||||
%endif
|
||||
|
||||
|
||||
%define libssh_version 0.7.1
|
||||
%if 0%{?fedora} > 0 && 0%{?fedora} < 22
|
||||
%define libssh_version 0.6.0
|
||||
@ -93,6 +100,9 @@ Recommends: %{name}-dashboard = %{version}-%{release}
|
||||
Recommends: %{name}-networkmanager = %{version}-%{release}
|
||||
Recommends: %{name}-storaged = %{version}-%{release}
|
||||
Recommends: sscg >= 2.3
|
||||
%if 0%{?rhel} >= 8
|
||||
Recommends: subscription-manager-cockpit
|
||||
%endif
|
||||
%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
|
||||
Recommends: %{name}-docker = %{version}-%{release}
|
||||
%endif
|
||||
@ -152,7 +162,6 @@ make -j4 check
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
make install-tests DESTDIR=%{buildroot}
|
||||
make install-integration-tests DESTDIR=%{buildroot}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
|
||||
install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
|
||||
rm -f %{buildroot}/%{_libdir}/cockpit/*.so
|
||||
@ -202,8 +211,12 @@ find %{buildroot}%{_datadir}/%{name}/kdump -type f >> kdump.list
|
||||
echo '%dir %{_datadir}/%{name}/sosreport' > sosreport.list
|
||||
find %{buildroot}%{_datadir}/%{name}/sosreport -type f >> sosreport.list
|
||||
|
||||
echo '%dir %{_datadir}/%{name}/subscriptions' > subscriptions.list
|
||||
find %{buildroot}%{_datadir}/%{name}/subscriptions -type f >> subscriptions.list
|
||||
%if %{defined build_subscriptions}
|
||||
echo '%dir %{_datadir}/%{name}/subscriptions' >> system.list
|
||||
find %{buildroot}%{_datadir}/%{name}/subscriptions -type f >> system.list
|
||||
%else
|
||||
rm -rf %{buildroot}/%{_datadir}/%{name}/subscriptions
|
||||
%endif
|
||||
|
||||
echo '%dir %{_datadir}/%{name}/storaged' > storaged.list
|
||||
find %{buildroot}%{_datadir}/%{name}/storaged -type f >> storaged.list
|
||||
@ -267,9 +280,9 @@ sed -i '/\.map\(\.gz\)\?$/d' *.list
|
||||
tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
|
||||
rm -rf %{buildroot}/usr/src/debug
|
||||
|
||||
# On RHEL kdump, subscriptions, networkmanager, selinux, and sosreport are part of the system package
|
||||
# On RHEL kdump, networkmanager, selinux, and sosreport are part of the system package
|
||||
%if 0%{?rhel}
|
||||
cat kdump.list subscriptions.list sosreport.list networkmanager.list selinux.list >> system.list
|
||||
cat kdump.list sosreport.list networkmanager.list selinux.list >> system.list
|
||||
rm %{buildroot}/usr/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
|
||||
rm %{buildroot}/usr/share/pixmaps/cockpit-sosreport.png
|
||||
%endif
|
||||
@ -357,6 +370,7 @@ The Cockpit components for managing oVirt virtual machines.
|
||||
%files machines-ovirt -f ovirt.list
|
||||
|
||||
%package ostree
|
||||
BuildArch: noarch
|
||||
Summary: Cockpit user interface for rpm-ostree
|
||||
# Requires: Uses new translations functionality
|
||||
Requires: %{name}-bridge >= 124.x
|
||||
@ -480,6 +494,8 @@ Recommends: setroubleshoot-server >= 3.3.3
|
||||
%endif
|
||||
Provides: %{name}-selinux = %{version}-%{release}
|
||||
Provides: %{name}-sosreport = %{version}-%{release}
|
||||
%endif
|
||||
%if %{defined build_subscriptions}
|
||||
Provides: %{name}-subscriptions = %{version}-%{release}
|
||||
Requires: subscription-manager >= 1.13
|
||||
%endif
|
||||
@ -506,34 +522,6 @@ These files are not required for running Cockpit.
|
||||
%{_datadir}/%{name}/playground
|
||||
%{_prefix}/%{__lib}/cockpit-test-assets
|
||||
|
||||
%package integration-tests
|
||||
Summary: Integration tests for Cockpit
|
||||
Requires: curl
|
||||
Requires: expect
|
||||
Requires: libvirt
|
||||
Requires: libvirt-client
|
||||
Requires: libvirt-daemon
|
||||
%if 0%{?rhel} >= 8 || 0%{?centos} >= 8 || 0%{?fedora} >= 27
|
||||
Requires: python2-libvirt
|
||||
%else
|
||||
Requires: libvirt-python
|
||||
%endif
|
||||
Requires: qemu-kvm
|
||||
Requires: npm
|
||||
Requires: python2
|
||||
Requires: rsync
|
||||
Requires: xz
|
||||
Requires: openssh-clients
|
||||
Requires: fontconfig
|
||||
|
||||
%description integration-tests
|
||||
This package contains Cockpit's integration tests for running in VMs.
|
||||
These are not required for running Cockpit.
|
||||
|
||||
%files integration-tests
|
||||
%{_datadir}/%{name}/test
|
||||
%{_datadir}/%{name}/containers
|
||||
|
||||
%package ws
|
||||
Summary: Cockpit Web Service
|
||||
Requires: glib-networking
|
||||
@ -615,19 +603,6 @@ sosreport tool.
|
||||
/usr/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
|
||||
/usr/share/pixmaps/cockpit-sosreport.png
|
||||
|
||||
%package subscriptions
|
||||
Summary: Cockpit subscription user interface package
|
||||
Requires: %{name}-bridge >= 122
|
||||
Requires: %{name}-shell >= 122
|
||||
Requires: subscription-manager >= 1.13
|
||||
BuildArch: noarch
|
||||
|
||||
%description subscriptions
|
||||
This package contains the Cockpit user interface integration with local
|
||||
subscription management.
|
||||
|
||||
%files subscriptions -f subscriptions.list
|
||||
|
||||
%package networkmanager
|
||||
Summary: Cockpit user interface for networking, using NetworkManager
|
||||
Requires: %{name}-bridge >= 122
|
||||
@ -718,6 +693,12 @@ via PackageKit.
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Wed Mar 07 2018 Martin Pitt <martin@piware.de> - 163-1
|
||||
|
||||
- Drop "Transfer data asynchronously" VDO option on Storage page
|
||||
- Hide Docker storage pool reset button when it cannot work properly
|
||||
- Update jQuery to version 3.3.1 (deprecated cockpit API!)
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 161-2
|
||||
- Escape macros in %%changelog
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cockpit-161.tar.xz) = ab0cf516242ba835e316fc2a80fc617815dd64f208441258a688f671e8d8bf7df308230d6c6964af8df551ca689c5d2ef40caf009ce61a0efb41988196e29586
|
||||
SHA512 (cockpit-163.tar.xz) = 13e333ce359d82873ee8c8ffe52096a9e972ae39b0760ecd32668521d2973340d70df6b08f249fe5428a0213853145e45717653f184e6afbeb96c69746cb5db3
|
||||
|
||||
Loading…
Reference in New Issue
Block a user