import cockpit-appstream-261-1.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
d57e49e8e5
commit
1c6bf1ea63
@ -1,2 +1,2 @@
|
||||
cb512e9b1bf87e415d07ae6d1b2d2c267c4b6df1 SOURCES/cockpit-259.tar.xz
|
||||
3cc9fa3f1fa4a0f637c0bc37949b17402741914d SOURCES/cockpit-machines-258.1.tar.xz
|
||||
360ffc52d80001825cf85bfd4b6bcfcfed436b7a SOURCES/cockpit-261.tar.xz
|
||||
1e7b584f0dbd12ad845136a5465199bfc5e9e7e9 SOURCES/cockpit-machines-260.tar.xz
|
||||
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/cockpit-259.tar.xz
|
||||
SOURCES/cockpit-machines-258.1.tar.xz
|
||||
SOURCES/cockpit-261.tar.xz
|
||||
SOURCES/cockpit-machines-260.tar.xz
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# This spec file has been automatically updated
|
||||
Version: 259
|
||||
Version: 261
|
||||
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 258.1
|
||||
%define machines_version 260
|
||||
|
||||
# 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.xz
|
||||
%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-{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
|
||||
@ -165,12 +159,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
|
||||
@ -179,10 +171,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
|
||||
|
||||
@ -236,10 +229,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
|
||||
@ -254,7 +247,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
|
||||
@ -266,7 +259,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
|
||||
@ -494,8 +487,6 @@ 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
|
||||
@ -545,8 +536,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
|
||||
@ -753,6 +744,12 @@ 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
|
||||
- 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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user