!3 更新版本至4.4.1

From: @weishaokun
Reviewed-by: @crrs666
Signed-off-by: @crrs666
This commit is contained in:
openeuler-ci-bot 2021-07-07 09:32:46 +00:00 committed by Gitee
commit a8590d04f6
2 changed files with 27 additions and 49 deletions

View File

@ -1,37 +1,25 @@
%global vdsm_version 4.30.34
%define debug_package %{nil}
%global vdsm_version 4.40.18
Name: ovirt-host
Version: 4.3.5
Release: 1%{?dist}
Version: 4.4.1
Release: 1
Summary: Track required packages for oVirt hosts
License: ASL 2.0
URL: http://www.ovirt.org
URL: https://www.ovirt.org/
Source0: LICENSE
# It was wrong to build as noarch, because there are
# arch-specific dependencies.
Obsoletes: %{name}.noarch <= %{version}-%{release}
Conflicts: %{name}.noarch
Requires: %{name}-dependencies = %{version}-%{release}
#Inherited from oVirt Node
Requires: cockpit
Requires: cockpit-dashboard
Requires: cockpit-networkmanager
Requires: cockpit-machines-ovirt
%ifarch x86_64
Requires: cockpit-ovirt-dashboard
%endif
Requires: firewalld
%if 0%{?fedora} || 0%{?rhel} >= 8
Requires: python3-firewall
%else
Requires: python-firewall
%endif
Requires: rng-tools
Requires: vdsm-hook-fcoe
Requires: vdsm-hook-vhostmd
@ -44,14 +32,12 @@ Requires: ovirt-hosted-engine-setup
Requires: ovirt-provider-ovn-driver
%endif
Requires: server(smtp)
%if 0%{?fedora} || 0%{?rhel} > 7
Suggests: postfix
%endif
Requires: mailx
Requires: dracut-fips
Requires: screen
Requires: sysstat
Requires: tcpdump
Requires: tmux
Requires: net-snmp
Requires: net-snmp-utils
@ -63,14 +49,15 @@ Requires: ipa-client
# Hardening packages - from https://bugzilla.redhat.com/show_bug.cgi?id=1598318
Requires: openscap
Requires: openscap-utils
Requires: scap-security-guide
%if 0%{?rhel}
Requires: pam_pkcs11
Requires: coolkey
Requires: opensc
%endif
Requires: aide
# additional packages now required by STIG security profile
# from https://bugzilla.redhat.com/show_bug.cgi?id=1836026
Requires: opensc
Requires: pcsc-lite
Requires: audispd-plugins
# Helping cockpit when hardening: https://bugzilla.redhat.com/show_bug.cgi?id=1835661
Requires: sscg
# https://bugzilla.redhat.com/show_bug.cgi?id=1722173
Requires: iperf3
@ -81,37 +68,24 @@ Requires: libvirt-admin
# https://bugzilla.redhat.com/show_bug.cgi?id=1741792
Requires: clevis-dracut
%ifarch x86_64
# from https://bugzilla.redhat.com/show_bug.cgi?id=1425032
# katello-agent has been dropped from Fedora on fc22 but it's still built
# on https://fedorapeople.org/groups/katello/releases/yum/latest/client/
# packages will be imported in oVirt repo.
Requires: katello-agent
%endif
# the following packages requires a RHGS subscription on RHEL, keeping them
# in oVirt Node only
# Requires: gdeploy
# https://bugzilla.redhat.com/show_bug.cgi?id=1812014
Requires: cracklib-dicts
# the following packages have dependencies which require RHGS subscription on
# RHEL, keeping them in oVirt Node only
# Requires: vdsm-gluster -> glusterfs-server
%description
This meta package pulls in all the dependencies needed for an oVirt hosts
This meta package pulls in all the dependencies needed for an oVirt hosts.
%package dependencies
Summary: This meta package pulls in all the dependencies needed for minimal oVirt hosts
Summary: This meta package pulls in all the dependencies needed for minimal oVirt hosts.
Requires: collectd
Requires: collectd-disk
Requires: collectd-netlink
Requires: collectd-write_http
Requires: collectd-virt
%if 0%{?rhel}
# collectd-write_syslog is available only on EL7
Requires: collectd-write_syslog
%endif
%ifarch %{ix86} x86_64
Requires: dmidecode
@ -133,19 +107,15 @@ Requires: socat
Requires: tar
Requires: tuned
Requires: util-linux
%ifarch x86_64
Requires: v2v-conversion-host-wrapper
%endif
Requires: vdsm >= %{vdsm_version}
Requires: vdsm-client >= %{vdsm_version}
# https://bugzilla.redhat.com/show_bug.cgi?id=1836645
Requires: ovirt-imageio-client
%ifarch x86_64
#{ CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
%if 0%{?rhel}
Requires: microcode_ctl >= 2.1-47.2
%else
Requires: microcode_ctl >= 2.1-29
%endif
#}
%endif
@ -172,5 +142,9 @@ cp %{SOURCE0} .
%license LICENSE
%changelog
* Wed Jul 07 2021 weishaokun <weishaokun@kylinos.cn> - 4.4.1-4
- Update version
* Tue Mar 3 2020 changjie.fu <changjie.fu@cs2c.com.cn> - 4.3.5-1
- Package Initialization

4
ovirt-host.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: oVirt/ovirt-host
tag_prefix: ^ovirt-host-
seperator: .