Compare commits

..

No commits in common. "c8" and "imports/c8s/cockpit-appstream-283-1.el8" have entirely different histories.

3 changed files with 20 additions and 222 deletions

View File

@ -1,2 +1,2 @@
89104bee2348d0999a2aa1d9798971ae2db6bdb7 SOURCES/cockpit-310.3.tar.xz
c40c7f66f1ff9f2e0fa7ca614dd4cabdfe7d8189 SOURCES/cockpit-machines-308.3.tar.xz
0cf4b6630c50c629f93cac26c1c2a57c42e0d1ae SOURCES/cockpit-283.tar.xz
2b2076064a21f5b11934e1d0dfe060e9296438fa SOURCES/cockpit-machines-281.tar.xz

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/cockpit-310.3.tar.xz
SOURCES/cockpit-machines-308.3.tar.xz
SOURCES/cockpit-283.tar.xz
SOURCES/cockpit-machines-281.tar.xz

View File

@ -28,7 +28,7 @@
# we maintain the basic/optional split, then it can be replaced with just %{version}.
%define required_base 266
%define machines_version 308.3
%define machines_version 281
# we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
%if 0%{?centos}
@ -48,11 +48,11 @@
Name: cockpit-appstream
Summary: Web Console for Linux servers
License: LGPL-2.1-or-later
License: LGPLv2+
URL: https://cockpit-project.org/
Version: 310.3
Release: 3%{?dist}
Version: 283
Release: 1%{?dist}
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
Source1: https://github.com/cockpit-project/cockpit-machines/releases/download/%{machines_version}/cockpit-machines-%{machines_version}.tar.xz
@ -84,14 +84,6 @@ Source1: https://github.com/cockpit-project/cockpit-machines/releases/dow
%define disallow_root 1
%endif
# pcp stopped building on ix86
%define build_pcp 1
%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
%ifarch %ix86
%define build_pcp 0
%endif
%endif
# Ship custom SELinux policy (but not for cockpit-appstream)
%if "%{name}" == "cockpit"
%define selinuxtype targeted
@ -106,7 +98,7 @@ BuildRequires: pam-devel
BuildRequires: autoconf automake
BuildRequires: make
BuildRequires: python3-devel
BuildRequires: /usr/bin/python3
%if 0%{?rhel} && 0%{?rhel} <= 8
# RHEL 8's gettext does not yet have metainfo.its
BuildRequires: gettext >= 0.19.7
@ -130,19 +122,15 @@ BuildRequires: glib2-devel >= 2.50.0
BuildRequires: systemd-devel >= 235
%if 0%{?suse_version}
BuildRequires: distribution-release
%if %{build_pcp}
BuildRequires: libpcp-devel
BuildRequires: pcp-devel
BuildRequires: libpcp3
BuildRequires: libpcp_import1
%endif
BuildRequires: openssh
BuildRequires: distribution-logos
BuildRequires: wallpaper-branding
%else
%if %{build_pcp}
BuildRequires: pcp-libs-devel
%endif
BuildRequires: openssh-clients
BuildRequires: docbook-style-xsl
%endif
@ -169,8 +157,6 @@ Suggests: cockpit-pcp
%if 0%{?rhel} == 0
Recommends: (cockpit-networkmanager if NetworkManager)
# c-ostree is not in RHEL 8/9
Recommends: (cockpit-ostree if rpm-ostree)
Suggests: cockpit-selinux
%endif
%if 0%{?rhel} && 0%{?centos} == 0
@ -193,9 +179,6 @@ Requires: subscription-manager-cockpit
%if 0%{?build_basic} == 0
--disable-ssh \
%endif
%if %{build_pcp} == 0
--disable-pcp \
%endif
%make_build
@ -205,7 +188,7 @@ make -j$(nproc) check
%install
%make_install
make install-tests DESTDIR=%{buildroot}
make -C %{_builddir}/cockpit-machines-%{machines_version}/cockpit-machines install DESTDIR=%{buildroot} PREFIX=/usr
make -C %{_builddir}/cockpit-machines-%{machines_version}/cockpit-machines install 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
@ -218,16 +201,15 @@ echo '%dir %{_datadir}/cockpit/base1' >> base.list
find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list
%if 0%{?build_basic}
echo '%dir %{_datadir}/cockpit/ssh' >> base.list
find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
%endif
echo '%{_libexecdir}/cockpit-ssh' >> base.list
%if %{build_pcp}
echo '%dir %{_datadir}/cockpit/pcp' > pcp.list
find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
%endif
echo '%dir %{_datadir}/cockpit/tuned' > system.list
find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list
echo '%dir %{_datadir}/cockpit/shell' >> system.list
find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list
@ -274,7 +256,7 @@ find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list
# when not building basic packages, remove their files
%if 0%{?build_basic} == 0
for pkg in base1 branding motd kdump networkmanager selinux shell sosreport static systemd users metrics; do
for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users metrics; do
rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
done
@ -284,14 +266,13 @@ done
rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d
find %{buildroot}/%{_unitdir}/ -type f ! -name 'cockpit-session*' -delete
for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do
rm -f %{buildroot}/%{_libexecdir}/$libexec
rm %{buildroot}/%{_libexecdir}/$libexec
done
rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
rm -f %{buildroot}/%{_libdir}/security/pam_*
rm -f %{buildroot}/usr/bin/cockpit-bridge
rm %{buildroot}/usr/bin/cockpit-bridge
rm -f %{buildroot}%{_libexecdir}/cockpit-ssh
rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
rm -rf %{buildroot}%{python3_sitelib}/cockpit*
%endif
# when not building optional packages, remove their files
@ -327,7 +308,6 @@ cat kdump.list sosreport.list networkmanager.list selinux.list >> system.list
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}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml
rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml
rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
%endif
@ -420,88 +400,6 @@ Provides: cockpit-sosreport = %{version}-%{release}
Recommends: (reportd if abrt)
%endif
Provides: bundled(npm(@patternfly/patternfly)) = 5.1.0
Provides: bundled(npm(@patternfly/react-core)) = 5.1.2
Provides: bundled(npm(@patternfly/react-icons)) = 5.1.2
Provides: bundled(npm(@patternfly/react-styles)) = 5.1.2
Provides: bundled(npm(@patternfly/react-table)) = 5.1.2
Provides: bundled(npm(@patternfly/react-tokens)) = 5.1.2
Provides: bundled(npm(argparse)) = 1.0.10
Provides: bundled(npm(array-buffer-byte-length)) = 1.0.0
Provides: bundled(npm(attr-accept)) = 2.2.2
Provides: bundled(npm(autolinker)) = 3.16.2
Provides: bundled(npm(available-typed-arrays)) = 1.0.5
Provides: bundled(npm(call-bind)) = 1.0.5
Provides: bundled(npm(date-fns)) = 3.2.0
Provides: bundled(npm(deep-equal)) = 2.2.3
Provides: bundled(npm(define-data-property)) = 1.1.1
Provides: bundled(npm(define-properties)) = 1.2.1
Provides: bundled(npm(es-get-iterator)) = 1.1.3
Provides: bundled(npm(file-selector)) = 0.6.0
Provides: bundled(npm(focus-trap)) = 7.5.2
Provides: bundled(npm(for-each)) = 0.3.3
Provides: bundled(npm(function-bind)) = 1.1.2
Provides: bundled(npm(functions-have-names)) = 1.2.3
Provides: bundled(npm(get-intrinsic)) = 1.2.2
Provides: bundled(npm(gopd)) = 1.0.1
Provides: bundled(npm(has-bigints)) = 1.0.2
Provides: bundled(npm(has-property-descriptors)) = 1.0.1
Provides: bundled(npm(has-proto)) = 1.0.1
Provides: bundled(npm(has-symbols)) = 1.0.3
Provides: bundled(npm(has-tostringtag)) = 1.0.0
Provides: bundled(npm(hasown)) = 2.0.0
Provides: bundled(npm(internal-slot)) = 1.0.6
Provides: bundled(npm(is-arguments)) = 1.1.1
Provides: bundled(npm(is-array-buffer)) = 3.0.2
Provides: bundled(npm(is-bigint)) = 1.0.4
Provides: bundled(npm(is-boolean-object)) = 1.1.2
Provides: bundled(npm(is-callable)) = 1.2.7
Provides: bundled(npm(is-date-object)) = 1.0.5
Provides: bundled(npm(is-map)) = 2.0.2
Provides: bundled(npm(is-number-object)) = 1.0.7
Provides: bundled(npm(is-regex)) = 1.1.4
Provides: bundled(npm(is-set)) = 2.0.2
Provides: bundled(npm(is-shared-array-buffer)) = 1.0.2
Provides: bundled(npm(is-string)) = 1.0.7
Provides: bundled(npm(is-symbol)) = 1.0.4
Provides: bundled(npm(is-typed-array)) = 1.1.12
Provides: bundled(npm(is-weakmap)) = 2.0.1
Provides: bundled(npm(is-weakset)) = 2.0.2
Provides: bundled(npm(isarray)) = 2.0.5
Provides: bundled(npm(js-sha1)) = 0.6.0
Provides: bundled(npm(js-sha256)) = 0.10.1
Provides: bundled(npm(js-tokens)) = 4.0.0
Provides: bundled(npm(json-stable-stringify-without-jsonify)) = 1.0.1
Provides: bundled(npm(lodash)) = 4.17.21
Provides: bundled(npm(loose-envify)) = 1.4.0
Provides: bundled(npm(object-assign)) = 4.1.1
Provides: bundled(npm(object-inspect)) = 1.13.1
Provides: bundled(npm(object-is)) = 1.1.5
Provides: bundled(npm(object-keys)) = 1.1.1
Provides: bundled(npm(object.assign)) = 4.1.5
Provides: bundled(npm(prop-types)) = 15.8.1
Provides: bundled(npm(react-dom)) = 18.2.0
Provides: bundled(npm(react-dropzone)) = 14.2.3
Provides: bundled(npm(react-is)) = 16.13.1
Provides: bundled(npm(react)) = 18.2.0
Provides: bundled(npm(regexp.prototype.flags)) = 1.5.1
Provides: bundled(npm(remarkable)) = 2.0.1
Provides: bundled(npm(scheduler)) = 0.23.0
Provides: bundled(npm(set-function-length)) = 1.2.0
Provides: bundled(npm(set-function-name)) = 2.0.1
Provides: bundled(npm(side-channel)) = 1.0.4
Provides: bundled(npm(sprintf-js)) = 1.0.3
Provides: bundled(npm(stop-iteration-iterator)) = 1.0.0
Provides: bundled(npm(tabbable)) = 6.2.0
Provides: bundled(npm(throttle-debounce)) = 5.0.0
Provides: bundled(npm(tslib)) = 2.6.2
Provides: bundled(npm(uuid)) = 9.0.1
Provides: bundled(npm(which-boxed-primitive)) = 1.0.2
Provides: bundled(npm(which-collection)) = 1.0.1
Provides: bundled(npm(which-typed-array)) = 1.1.13
Provides: bundled(npm(xterm-addon-canvas)) = 0.5.0
Provides: bundled(npm(xterm)) = 5.3.0
%description system
This package contains the Cockpit shell and system configuration interfaces.
@ -518,7 +416,7 @@ Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
Conflicts: firewalld < 0.6.0-1
Recommends: sscg >= 2.3
Recommends: system-logos
Suggests: sssd-dbus >= 2.6.2
Suggests: sssd-dbus
# for cockpit-desktop
Suggests: python3
@ -610,7 +508,7 @@ fi
test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
# check for deprecated PAM config
if test -f %{_sysconfdir}/pam.d/cockpit && grep -q pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then
if grep --color=auto pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then
echo '**** WARNING:'
echo '**** WARNING: pam_cockpit_cert is a no-op and will be removed in a'
echo '**** WARNING: future release; remove it from your /etc/pam.d/cockpit.'
@ -673,7 +571,6 @@ BuildArch: noarch
The Cockpit component for managing networking. This package uses NetworkManager.
%files networkmanager -f networkmanager.list
%{_datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml
%endif
@ -700,8 +597,7 @@ utility setroubleshoot to diagnose and resolve SELinux issues.
# RPM requires this
%description
Cockpit packages for RHEL/CentOS 8 AppStream: Machines, PCP, Storage, and
Software Updates.
Dummy package from building optional packages only; never install or publish me.
#/ build basic packages
%endif
@ -717,9 +613,6 @@ Requires: cockpit-shell >= %{required_base}
Requires: udisks2 >= 2.9
Recommends: udisks2-lvm2 >= 2.9
Recommends: udisks2-iscsi >= 2.9
%if ! 0%{?rhel}
Recommends: udisks2-btrfs >= 2.9
%endif
Recommends: device-mapper-multipath
Recommends: clevis-luks
Requires: %{__python3}
@ -734,6 +627,7 @@ BuildArch: noarch
The Cockpit component for managing storage. This package uses udisks.
%files -n cockpit-storaged -f storaged.list
%dir %{_datadir}/cockpit/storaged/images
%{_datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml
%package -n cockpit-tests
@ -780,8 +674,6 @@ If "virt-install" is installed, you can also create new virtual machines.
%files -n cockpit-machines -f machines.list
%{_datadir}/metainfo/org.cockpit-project.machines.metainfo.xml
%if %{build_pcp}
%package -n cockpit-pcp
Summary: Cockpit PCP integration
Requires: cockpit-bridge >= %{required_base}
@ -797,8 +689,6 @@ Cockpit support for reading PCP metrics and loading PCP archives.
%post -n cockpit-pcp
systemctl reload-or-try-restart pmlogger
%endif
%package -n cockpit-packagekit
Summary: Cockpit user interface for packages
BuildArch: noarch
@ -819,98 +709,6 @@ via PackageKit.
# The changelog is automatically generated and merged
%changelog
* Thu May 02 2024 Martin Pitt <mpitt@redhat.com> - 310.3-3
- Machines: Fix detaching host devices for running VMs (RHEL-34694)
* Tue Feb 20 2024 Martin Pitt <mpitt@redhat.com> - 310.3-2
- Machines: Mass SPICE replacement
- Machines: Pre-formatted Block Device storage pool support
- Machines: Translation updates (jira#RHEL-14230)
* Thu Feb 15 2024 Martin Pitt <mpitt@redhat.com> - 310.3-1
- Translation updates (jira#RHEL-16681)
Lots of bug fixes
* Wed Jan 31 2024 Martin Pitt <mpitt@redhat.com> - 310-1
- Storage: support for btrfs
- Storage: improved support for swap
- Machines: Action to Replace SPICE devices (RHEL-17433)
- Machines: Create external snapshots when supported
- Machines: Fix VM creation on s390x (RHEL-22241)
* Thu Jan 18 2024 Martin Pitt <mpitt@redhat.com> - 309-1
- Machines: Fix deletion of SSH keys (jira#RHEL-19598)
* Fri Dec 15 2023 Martin Pitt <mpitt@redhat.com> - 307-1
- Storage redesign
- Machines: Stop configuring SPICE by default for new VMs (jira#RHEL-18058)
* Wed Nov 29 2023 Martin Pitt <mpitt@redhat.com> - 306-1
- Machines: Change "Add disk" default behavior
* Thu Nov 23 2023 Martin Pitt <mpitt@redhat.com> - 305-1
- Performance and stability improvements
* Wed Nov 01 2023 Martin Pitt <mpitt@redhat.com> - 304-1
- Storage: Support for RAID layouts with LVM2
* Thu Oct 19 2023 Martin Pitt <mpitt@redhat.com> - 303-1
- Apps: Warn if appstream data package is missing
- Storage: Partitions can be resized
* Wed Sep 20 2023 Martin Pitt <mpitt@redhat.com> - 301-1
- WireGuard support
- Metrics: link to network interface details
* Wed Sep 06 2023 Martin Pitt <mpitt@redhat.com> - 300-1
- Celebrating the Nürnberg life release!
- Storage: Support for growing block devices of a Stratis pool
* Wed Aug 23 2023 Martin Pitt <mpitt@redhat.com> - 299-1
- Storage: Support for no-overprovisioning with Stratis
- Storage: Cockpit can now add caches to encrypted Stratis pools
* Wed Jul 26 2023 Martin Pitt <mpitt@redhat.com> - 297-1
- Bug fixes
* Wed Jul 12 2023 Martin Pitt <mpitt@redhat.com> - 296-1
- Machines: Fix "Edit" button CSS for transient VMs (rhbz#2215597)
- Machines: Fix format detection for CD/DVD images (rhbz#2215599)
* Wed Jun 28 2023 Martin Pitt <mpitt@redhat.com> - 295-1
- Machines: Vsock device support
- Machines: Confirm shutdown actions
- Machines: Show virtual interface's TAP device
* Tue May 16 2023 Martin Pitt <mpitt@redhat.com> - 292-1
- Metrics: Add disk IO per service
- Several right-to-left language fixes
- Machines: Apply watchdog changes on next boot if hotplug fails
* Tue May 09 2023 Martin Pitt <mpitt@redhat.com> - 291-1
- Update to PatternFly 5 Alpha
- Machines: Option to use RAW volume during VM creation
- Machines: Redesign VMs CPU configuration
* Wed Apr 06 2023 Katerina Koukiou <kkoukiou@redhat.com> - 289-1
- Machines: Show an alert when virtualization is disabled in BIOS/EFI
- Storage: Mounting filesystems at boot time
- Machines: Create VM based on cloud image and start it later (rhbz#1913548)
* Thu Feb 23 2023 Martin Pitt <mpitt@redhat.com> - 286.1-1
- Translation updates (rhbz#2139719)
* Wed Feb 22 2023 Martin Pitt <mpitt@redhat.com> - 286-1
- Stability and performance improvements
* Wed Feb 08 2023 Martin Pitt <mpitt@redhat.com> - 285-1
- Stability and performance improvements
* Thu Jan 26 2023 Martin Pitt <mpitt@redhat.com> - 284-1
- Storage: Set up a system to use NBDE
- Machines: Option to forcefully revert a snapshot
- Fix tabular numbers font
* Wed Jan 11 2023 Katerina Koukiou <kkoukiou@redhat.com> - 283-1
- Machines: Summarize system and user session differences
- Machines: Virtual watchdog device support