import cockpit-261-1.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
60ad8d053f
commit
f52ec36ed1
|
|
@ -1 +1 @@
|
|||
fb630c81745b08db09c1fd41f86d6b5f754bc4fc SOURCES/cockpit-260.tar.xz
|
||||
360ffc52d80001825cf85bfd4b6bcfcfed436b7a SOURCES/cockpit-261.tar.xz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
SOURCES/cockpit-260.tar.xz
|
||||
SOURCES/cockpit-261.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This spec file has been automatically updated
|
||||
Version: 260
|
||||
Version: 261
|
||||
Release: 1%{?dist}
|
||||
#
|
||||
# Copyright (C) 2014-2020 Red Hat, Inc.
|
||||
|
|
@ -26,10 +26,6 @@ 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
|
||||
|
|
@ -56,17 +52,15 @@ 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
|
||||
%endif
|
||||
Source0: https://github.com/cockpit-project/cockpit/releases/download/261/cockpit-261.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
|
||||
|
|
@ -161,12 +155,10 @@ Recommends: subscription-manager-cockpit
|
|||
%setup -q -n cockpit-%{version}
|
||||
|
||||
%build
|
||||
exec 2>&1
|
||||
%configure \
|
||||
--disable-silent-rules \
|
||||
--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
|
||||
|
|
@ -175,10 +167,11 @@ exec 2>&1
|
|||
--disable-ssh \
|
||||
%endif
|
||||
|
||||
make -j4 %{?extra_flags} all
|
||||
make -j$(nproc) %{?extra_flags} all
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
make -f /usr/share/selinux/devel/Makefile cockpit.pp
|
||||
rm -f cockpit.pp.bz2
|
||||
bzip2 -9 cockpit.pp
|
||||
%endif
|
||||
|
||||
|
|
@ -231,10 +224,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
|
||||
|
|
@ -249,7 +242,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
|
||||
|
|
@ -261,7 +254,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
|
||||
|
|
@ -535,8 +528,8 @@ fi
|
|||
# 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
|
||||
|
|
@ -718,6 +711,10 @@ via PackageKit.
|
|||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Tue Jan 25 2022 Matej Marusak <mmarusak@redhat.com> - 261-1
|
||||
- storage: Unmounting or deleting a busy filesystem is now supported
|
||||
- shell: Allow adding ssh keys with passphrase
|
||||
|
||||
* Wed Jan 05 2022 Martin Pitt <mpitt@redhat.com> - 260-1
|
||||
- Certificate login validation: Action required on updates
|
||||
- Client: Show previously used hosts
|
||||
|
|
|
|||
Loading…
Reference in New Issue