import cockpit-appstream-264.1-1.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
2f589a75d0
commit
88ecd67507
|
|
@ -1,2 +1,2 @@
|
|||
bc694f39e4dc50161bfb92b8ec768be9563717d7 SOURCES/cockpit-251.1.tar.xz
|
||||
a0f57d0c6cbb5c198464e58efbaeacdb8f0b8218 SOURCES/cockpit-machines-250.1.tar.gz
|
||||
bdc1568b2e05f52c14c626b1f22a089914b9b883 SOURCES/cockpit-264.1.tar.xz
|
||||
87ed0eeda8d77242dba1e3d4104e17b07904371a SOURCES/cockpit-machines-263.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SOURCES/cockpit-251.1.tar.xz
|
||||
SOURCES/cockpit-machines-250.1.tar.gz
|
||||
SOURCES/cockpit-264.1.tar.xz
|
||||
SOURCES/cockpit-machines-263.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This spec file has been automatically updated
|
||||
Version: 251.1
|
||||
Version: 264.1
|
||||
Release: 1%{?dist}
|
||||
#
|
||||
# Copyright (C) 2014-2020 Red Hat, Inc.
|
||||
|
|
@ -26,16 +26,12 @@ Release: 1%{?dist}
|
|||
#
|
||||
# Check first cockpit-devel@lists.fedorahosted.org
|
||||
#
|
||||
# Globals that may be defined elsewhere
|
||||
# * Version 122
|
||||
# * wip 1
|
||||
#
|
||||
|
||||
# earliest base that the subpackages work on; the instances of this get computed/updated
|
||||
# by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
|
||||
%define required_base 122
|
||||
|
||||
%define machines_version 250.1
|
||||
%define machines_version 263
|
||||
|
||||
# we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
|
||||
%if 0%{?centos}
|
||||
|
|
@ -58,18 +54,16 @@ Summary: Web Console for Linux servers
|
|||
License: LGPLv2+
|
||||
URL: https://cockpit-project.org/
|
||||
|
||||
%if %{defined wip}
|
||||
Source0: cockpit-%{version}.tar.xz
|
||||
%else
|
||||
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.gz
|
||||
%endif
|
||||
Source1: https://github.com/cockpit-project/cockpit-machines/releases/download/%{machines_version}/cockpit-machines-%{machines_version}.tar.xz
|
||||
|
||||
# in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
|
||||
# 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
|
||||
# We also provide an override mechanism if you want to build all packages.
|
||||
%define build_all 0
|
||||
%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !%{build_all}
|
||||
|
||||
%if "%{name}" == "cockpit"
|
||||
%define build_basic 1
|
||||
|
|
@ -84,11 +78,10 @@ Source1: https://github.com/cockpit-project/cockpit-machines/releases/dow
|
|||
%define build_optional 1
|
||||
%endif
|
||||
|
||||
# Ship custom SELinux policy only in Fedora and RHEL-9 onward
|
||||
%if 0%{?rhel} >= 9 || 0%{?fedora}
|
||||
# Ship custom SELinux policy (but not for cockpit-appstream)
|
||||
%if "%{name}" == "cockpit"
|
||||
%define selinuxtype targeted
|
||||
%define with_selinux 1
|
||||
%define selinux_policy_version %(rpm --quiet -q selinux-policy && rpm -q --queryformat "%{V}-%{R}" selinux-policy || echo 1)
|
||||
%define selinux_configure_arg --enable-selinux-policy=%{selinuxtype}
|
||||
%endif
|
||||
|
||||
BuildRequires: gcc
|
||||
|
|
@ -135,10 +128,8 @@ BuildRequires: gdb
|
|||
# For documentation
|
||||
BuildRequires: xmlto
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
BuildRequires: selinux-policy
|
||||
BuildRequires: selinux-policy-devel
|
||||
%endif
|
||||
|
||||
# This is the "cockpit" metapackage. It should only
|
||||
# Require, Suggest or Recommend other cockpit-xxx subpackages
|
||||
|
|
@ -149,7 +140,7 @@ Requires: cockpit-system
|
|||
|
||||
# Optional components
|
||||
Recommends: (cockpit-storaged if udisks2)
|
||||
Recommends: cockpit-packagekit
|
||||
Recommends: (cockpit-packagekit if dnf)
|
||||
Suggests: cockpit-pcp
|
||||
|
||||
%if 0%{?rhel} == 0
|
||||
|
|
@ -165,12 +156,10 @@ Recommends: subscription-manager-cockpit
|
|||
%setup -q -n cockpit-%{version}
|
||||
|
||||
%build
|
||||
exec 2>&1
|
||||
%configure \
|
||||
--disable-silent-rules \
|
||||
%{?selinux_configure_arg} \
|
||||
--with-cockpit-user=cockpit-ws \
|
||||
--with-cockpit-ws-instance-user=cockpit-wsinstance \
|
||||
--with-selinux-config-type=etc_t \
|
||||
%if 0%{?suse_version}
|
||||
--docdir=%_defaultdocdir/%{name} \
|
||||
%endif
|
||||
|
|
@ -179,12 +168,7 @@ exec 2>&1
|
|||
--disable-ssh \
|
||||
%endif
|
||||
|
||||
make -j4 %{?extra_flags} all
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
make -f /usr/share/selinux/devel/Makefile cockpit.pp
|
||||
bzip2 -9 cockpit.pp
|
||||
%endif
|
||||
%make_build
|
||||
|
||||
%check
|
||||
exec 2>&1
|
||||
|
|
@ -211,21 +195,15 @@ install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
|
|||
rm -f %{buildroot}/%{_libdir}/cockpit/*.so
|
||||
install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
install -D -m 644 %{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
||||
install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_session_selinux.8cockpit
|
||||
install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_ws_selinux.8cockpit
|
||||
# create this directory in the build root so that %ghost sees the desired mode
|
||||
install -d -m 700 %{buildroot}%{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
|
||||
%endif
|
||||
|
||||
# only ship deprecated PatternFly API for stable releases
|
||||
%if 0%{?fedora} <= 33 || 0%{?rhel} <= 8
|
||||
%if 0%{?rhel} <= 8
|
||||
ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz
|
||||
%endif
|
||||
|
||||
# Build the package lists for resource packages
|
||||
echo '%dir %{_datadir}/cockpit/base1' > base.list
|
||||
# cockpit-bridge is the basic dependency for all cockpit-* packages, so centrally own the page directory
|
||||
echo '%dir %{_datadir}/cockpit' > base.list
|
||||
echo '%dir %{_datadir}/cockpit/base1' >> base.list
|
||||
echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list
|
||||
find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
|
||||
echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
|
||||
|
|
@ -234,10 +212,10 @@ echo '%dir %{_datadir}/cockpit/ssh' >> base.list
|
|||
find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
|
||||
echo '%{_libexecdir}/cockpit-ssh' >> base.list
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/pcp' >> pcp.list
|
||||
echo '%dir %{_datadir}/cockpit/pcp' > pcp.list
|
||||
find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/tuned' >> system.list
|
||||
echo '%dir %{_datadir}/cockpit/tuned' > system.list
|
||||
find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/shell' >> system.list
|
||||
|
|
@ -252,7 +230,7 @@ find %{buildroot}%{_datadir}/cockpit/users -type f >> system.list
|
|||
echo '%dir %{_datadir}/cockpit/metrics' >> system.list
|
||||
find %{buildroot}%{_datadir}/cockpit/metrics -type f >> system.list
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/kdump' >> kdump.list
|
||||
echo '%dir %{_datadir}/cockpit/kdump' > kdump.list
|
||||
find %{buildroot}%{_datadir}/cockpit/kdump -type f >> kdump.list
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/sosreport' > sosreport.list
|
||||
|
|
@ -264,7 +242,7 @@ find %{buildroot}%{_datadir}/cockpit/storaged -type f >> storaged.list
|
|||
echo '%dir %{_datadir}/cockpit/networkmanager' > networkmanager.list
|
||||
find %{buildroot}%{_datadir}/cockpit/networkmanager -type f >> networkmanager.list
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/packagekit' >> packagekit.list
|
||||
echo '%dir %{_datadir}/cockpit/packagekit' > packagekit.list
|
||||
find %{buildroot}%{_datadir}/cockpit/packagekit -type f >> packagekit.list
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/apps' >> packagekit.list
|
||||
|
|
@ -295,11 +273,11 @@ 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 cockpit-certificate-ensure; do
|
||||
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 %{buildroot}/%{_libexecdir}/$libexec
|
||||
done
|
||||
rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
|
||||
rm %{buildroot}/usr/bin/cockpit-bridge %{buildroot}/usr/sbin/remotectl
|
||||
rm %{buildroot}/usr/bin/cockpit-bridge
|
||||
rm -f %{buildroot}%{_libexecdir}/cockpit-ssh
|
||||
rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
|
||||
%endif
|
||||
|
|
@ -364,7 +342,6 @@ troubleshooting, interactive command-line sessions, and more.
|
|||
%{_docdir}/cockpit/AUTHORS
|
||||
%{_docdir}/cockpit/COPYING
|
||||
%{_docdir}/cockpit/README.md
|
||||
%dir %{_datadir}/cockpit
|
||||
%{_datadir}/metainfo/cockpit.appdata.xml
|
||||
%{_datadir}/pixmaps/cockpit.png
|
||||
%doc %{_mandir}/man1/cockpit.1.gz
|
||||
|
|
@ -436,14 +413,10 @@ Provides: cockpit-selinux = %{version}-%{release}
|
|||
Provides: cockpit-sosreport = %{version}-%{release}
|
||||
Requires: sos
|
||||
%endif
|
||||
%if 0%{?fedora} >= 29
|
||||
# 0.7.0 (actually) supports task cancellation.
|
||||
# 0.7.1 fixes tasks never announcing completion.
|
||||
Recommends: (reportd >= 0.7.1 if abrt)
|
||||
%if 0%{?fedora}
|
||||
Recommends: (reportd if abrt)
|
||||
%endif
|
||||
# NPM modules which are also available as packages
|
||||
Provides: bundled(js-jquery) = 3.5.1
|
||||
Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
|
||||
Provides: bundled(xstatic-patternfly-common) = 3.59.5
|
||||
|
||||
%description system
|
||||
|
|
@ -457,14 +430,17 @@ Summary: Cockpit Web Service
|
|||
Requires: glib-networking
|
||||
Requires: openssl
|
||||
Requires: glib2 >= 2.50.0
|
||||
%if 0%{?with_selinux}
|
||||
Requires: (selinux-policy >= %{selinux_policy_version} if selinux-policy-%{selinuxtype})
|
||||
Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype})
|
||||
Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
|
||||
%endif
|
||||
Conflicts: firewalld < 0.6.0-1
|
||||
Recommends: sscg >= 2.3
|
||||
Recommends: system-logos
|
||||
Suggests: sssd-dbus
|
||||
# for cockpit-desktop
|
||||
Suggests: python3
|
||||
|
||||
# prevent hard python3 dependency for cockpit-desktop, it falls back to other browsers
|
||||
%global __requires_exclude_from ^%{_libexecdir}/cockpit-client$
|
||||
|
||||
%description ws
|
||||
The Cockpit Web Service listens on the network, and authenticates users.
|
||||
|
|
@ -477,7 +453,6 @@ authentication via sssd/FreeIPA.
|
|||
%doc %{_mandir}/man5/cockpit.conf.5.gz
|
||||
%doc %{_mandir}/man8/cockpit-ws.8.gz
|
||||
%doc %{_mandir}/man8/cockpit-tls.8.gz
|
||||
%doc %{_mandir}/man8/remotectl.8.gz
|
||||
%doc %{_mandir}/man8/pam_ssh_add.8.gz
|
||||
%dir %{_sysconfdir}/cockpit
|
||||
%config(noreplace) %{_sysconfdir}/cockpit/ws-certs.d
|
||||
|
|
@ -493,32 +468,28 @@ authentication via sssd/FreeIPA.
|
|||
%{_unitdir}/cockpit.socket
|
||||
%{_unitdir}/cockpit-wsinstance-http.socket
|
||||
%{_unitdir}/cockpit-wsinstance-http.service
|
||||
%{_unitdir}/cockpit-wsinstance-http-redirect.socket
|
||||
%{_unitdir}/cockpit-wsinstance-http-redirect.service
|
||||
%{_unitdir}/cockpit-wsinstance-https-factory.socket
|
||||
%{_unitdir}/cockpit-wsinstance-https-factory@.service
|
||||
%{_unitdir}/cockpit-wsinstance-https@.socket
|
||||
%{_unitdir}/cockpit-wsinstance-https@.service
|
||||
%{_unitdir}/system-cockpithttps.slice
|
||||
%{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf
|
||||
%{_sbindir}/remotectl
|
||||
%{pamdir}/pam_ssh_add.so
|
||||
%{pamdir}/pam_cockpit_cert.so
|
||||
%{_libexecdir}/cockpit-ws
|
||||
%{_libexecdir}/cockpit-wsinstance-factory
|
||||
%{_libexecdir}/cockpit-tls
|
||||
%{_libexecdir}/cockpit-client
|
||||
%{_libexecdir}/cockpit-client.ui
|
||||
%{_libexecdir}/cockpit-desktop
|
||||
%{_libexecdir}/cockpit-certificate-ensure
|
||||
%{_libexecdir}/cockpit-certificate-helper
|
||||
%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session
|
||||
%{_datadir}/cockpit/branding
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
||||
%{_mandir}/man8/%{name}_session_selinux.8cockpit.*
|
||||
%{_mandir}/man8/%{name}_ws_selinux.8cockpit.*
|
||||
%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
|
||||
%endif
|
||||
%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
||||
%{_mandir}/man8/%{name}_session_selinux.8cockpit.*
|
||||
%{_mandir}/man8/%{name}_ws_selinux.8cockpit.*
|
||||
%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
|
||||
|
||||
%pre ws
|
||||
getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws
|
||||
|
|
@ -526,25 +497,21 @@ getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d /nonexisting
|
|||
getent group cockpit-wsinstance >/dev/null || groupadd -r cockpit-wsinstance
|
||||
getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws instances" cockpit-wsinstance
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
if %{_sbindir}/selinuxenabled 2>/dev/null; then
|
||||
%selinux_relabel_pre -s %{selinuxtype}
|
||||
fi
|
||||
%endif
|
||||
|
||||
%post ws
|
||||
%if 0%{?with_selinux}
|
||||
if %{_sbindir}/selinuxenabled 2>/dev/null; then
|
||||
if [ -x %{_sbindir}/selinuxenabled ]; then
|
||||
%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
||||
%selinux_relabel_post -s %{selinuxtype}
|
||||
fi
|
||||
%endif
|
||||
|
||||
# set up dynamic motd/issue symlinks on first-time install; don't bring them back on upgrades if admin removed them
|
||||
if [ "$1" = 1 ]; then
|
||||
mkdir -p /etc/motd.d /etc/issue.d
|
||||
ln -s /run/cockpit/motd /etc/motd.d/cockpit
|
||||
ln -s /run/cockpit/motd /etc/issue.d/cockpit.issue
|
||||
ln -s ../../run/cockpit/motd /etc/motd.d/cockpit
|
||||
ln -s ../../run/cockpit/motd /etc/issue.d/cockpit.issue
|
||||
fi
|
||||
|
||||
%tmpfiles_create cockpit-tempfiles.conf
|
||||
|
|
@ -564,12 +531,10 @@ fi
|
|||
%systemd_preun cockpit.socket cockpit.service
|
||||
|
||||
%postun ws
|
||||
%if 0%{?with_selinux}
|
||||
if %{_sbindir}/selinuxenabled 2>/dev/null; then
|
||||
if [ -x %{_sbindir}/selinuxenabled ]; then
|
||||
%selinux_modules_uninstall -s %{selinuxtype} %{name}
|
||||
%selinux_relabel_post -s %{selinuxtype}
|
||||
fi
|
||||
%endif
|
||||
%systemd_postun_with_restart cockpit.socket cockpit.service
|
||||
|
||||
# -------------------------------------------------------------------------------
|
||||
|
|
@ -751,8 +716,35 @@ via PackageKit.
|
|||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Thu Sep 09 2021 Martin Pitt <mpitt@redhat.com> - 251.1-1
|
||||
- Translation updates (rhbz#1999041)
|
||||
* Thu Mar 03 2022 Martin Pitt <mpitt@redhat.com> - 264.1-1
|
||||
- Translation updates (rhbz#2060292)
|
||||
|
||||
* Fri Feb 25 2022 Martin Pitt <mpitt@redhat.com> - 264-1
|
||||
- Machines: Fix broken VM deletion dialog layout
|
||||
- Translation updates
|
||||
|
||||
* Thu Feb 17 2022 Martin Pitt <mpitt@redhat.com> - 263-1
|
||||
- Overview: Show scheduled shutdowns
|
||||
- Networking: Add firewall service description
|
||||
- Shell: Fix browser history
|
||||
|
||||
* Tue Jan 25 2022 Matej Marusak <mmarusak@redhat.com> - 261-1
|
||||
- storage: Unmounting or deleting a busy filesystem is now supported
|
||||
- Tests improvements and stabilization
|
||||
- Machines: Delete disks only after VM is successfully undefined and destroyed (rhbz#2031678)
|
||||
- Machines: Do not change "startVm" value when selecting Unattended installation (rhbz#2033603)
|
||||
|
||||
* Tue Dec 14 2021 Martin Pitt <mpitt@redhat.com> - 259-1
|
||||
- Use official VDO LVM API
|
||||
|
||||
* Fri Nov 12 2021 Katerina Koukiou <kkoukiou@redhat.com> - 257-1
|
||||
- Machines: Now officially supported on Arch Linux (https://archlinux.org/)
|
||||
- Machines: Support selecting between consoles of the same type
|
||||
|
||||
* Thu Oct 14 2021 Martin Pitt <mpitt@redhat.com> - 255-1
|
||||
- Machines: Parse supported disk bus types from domcapabities (rhbz#1862779)
|
||||
- Machines: Stop exposing unattended installation option for ISO installation
|
||||
media (rhbz#1868594)
|
||||
|
||||
* Thu Aug 19 2021 Matej Marusak <mmarusak@redhat.com> - 251-1
|
||||
- Machines: Always show current disk bus type (rhbz#1985256)
|
||||
|
|
|
|||
Loading…
Reference in New Issue