Update to 242-1
- Support for pages built with snowpack - Machines: Split out to separate project
This commit is contained in:
Cockpit Project
parent
0220205193
commit
790b0fd5b9
1
.gitignore
vendored
1
.gitignore
vendored
@ -203,3 +203,4 @@
|
||||
/cockpit-239.tar.xz
|
||||
/cockpit-240.tar.xz
|
||||
/cockpit-241.tar.xz
|
||||
/cockpit-242.tar.xz
|
||||
|
||||
44
cockpit.spec
44
cockpit.spec
@ -1,5 +1,5 @@
|
||||
# This spec file has been automatically updated
|
||||
Version: 241
|
||||
Version: 242
|
||||
Release: 1%{?dist}
|
||||
#
|
||||
# Copyright (C) 2014-2020 Red Hat, Inc.
|
||||
@ -63,7 +63,7 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v
|
||||
%endif
|
||||
|
||||
# in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
|
||||
# and cockpit-appstream (building optional packages like cockpit-{machines,pcp})
|
||||
# and cockpit-appstream (building optional packages like cockpit-{pcp})
|
||||
# This split does not apply to EPEL/COPR.
|
||||
# In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream
|
||||
%if 0%{?rhel} == 8 && 0%{?epel} == 0
|
||||
@ -240,9 +240,6 @@ find %{buildroot}%{_datadir}/cockpit/packagekit -type f >> packagekit.list
|
||||
echo '%dir %{_datadir}/cockpit/apps' >> packagekit.list
|
||||
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
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/selinux' > selinux.list
|
||||
find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list
|
||||
|
||||
@ -264,7 +261,7 @@ done
|
||||
for lib in systemd tmpfiles.d; do
|
||||
rm -r %{buildroot}/%{_prefix}/%{__lib}/$lib
|
||||
done
|
||||
for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop cockpit-certificate-helper; do
|
||||
for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do
|
||||
rm %{buildroot}/%{_libexecdir}/$libexec
|
||||
done
|
||||
rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
|
||||
@ -275,15 +272,13 @@ rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
|
||||
|
||||
# when not building optional packages, remove their files
|
||||
%if 0%{?build_optional} == 0
|
||||
for pkg in apps machines packagekit pcp playground storaged; do
|
||||
for pkg in apps packagekit pcp playground storaged; do
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
|
||||
done
|
||||
# files from -tests
|
||||
rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets
|
||||
# files from -pcp
|
||||
rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/
|
||||
# files from -machines
|
||||
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml
|
||||
# files from -storaged
|
||||
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml
|
||||
%endif
|
||||
@ -481,6 +476,7 @@ authentication via sssd/FreeIPA.
|
||||
%{_libexecdir}/cockpit-wsinstance-factory
|
||||
%{_libexecdir}/cockpit-tls
|
||||
%{_libexecdir}/cockpit-desktop
|
||||
%{_libexecdir}/cockpit-certificate-ensure
|
||||
%{_libexecdir}/cockpit-certificate-helper
|
||||
%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session
|
||||
%{_datadir}/cockpit/branding
|
||||
@ -622,31 +618,6 @@ These files are not required for running Cockpit.
|
||||
%files -n cockpit-tests -f tests.list
|
||||
%{_prefix}/%{__lib}/cockpit-test-assets
|
||||
|
||||
%package -n cockpit-machines
|
||||
BuildArch: noarch
|
||||
Summary: Cockpit user interface for virtual machines
|
||||
Requires: cockpit-bridge >= 186
|
||||
Requires: cockpit-system >= 186
|
||||
%if 0%{?suse_version}
|
||||
Requires: libvirt-daemon-qemu
|
||||
%else
|
||||
Requires: libvirt-daemon-kvm
|
||||
%endif
|
||||
Requires: libvirt-client
|
||||
Requires: libvirt-dbus >= 1.2.0
|
||||
# Optional components
|
||||
Recommends: virt-install
|
||||
Recommends: libosinfo
|
||||
Recommends: python3-gobject-base
|
||||
|
||||
%description -n cockpit-machines
|
||||
The Cockpit components for managing virtual machines.
|
||||
|
||||
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
|
||||
|
||||
%package -n cockpit-pcp
|
||||
Summary: Cockpit PCP integration
|
||||
Requires: cockpit-bridge >= 238.1.1
|
||||
@ -680,6 +651,11 @@ via PackageKit.
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Wed Apr 14 2021 Matej Marusak <mmarusak@redhat.com> - 242-1
|
||||
|
||||
- Support for pages built with snowpack
|
||||
- Machines: Split out to separate project
|
||||
|
||||
* Wed Mar 31 2021 Simon Kobyda <skobyda@redhat.com> - 241-1
|
||||
|
||||
- kdump: redesign the page
|
||||
|
||||
@ -2,6 +2,6 @@ discover:
|
||||
how: fmf
|
||||
repository: https://github.com/cockpit-project/cockpit
|
||||
# FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585
|
||||
ref: "241"
|
||||
ref: "242"
|
||||
execute:
|
||||
how: tmt
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cockpit-241.tar.xz) = ebac207f4795b1c8aee844476807f68b8481bd86e8182cf8ec6b97cfc3ce4ab863c093763f7ce11ba1a4b99f5a85f69ea68cc2de5f76f9ffc6594d0a3b2a8814
|
||||
SHA512 (cockpit-242.tar.xz) = 2f09d6ac7e8a35034f40317e6444057222198b63d457ad72302803da1b627835c1d8a4cea66c5ed621b8536577856871f846793edafe2e8b0789675c23980736
|
||||
|
||||
Loading…
Reference in New Issue
Block a user