Skip to content

Commit df472e5

Browse files
committed
spec: cleanup versions/requirements
A cleanup of all the requirements and versions within the spec file. As we don't build on Fedora anymore and only CentOS/RHEL 9 & 10, we can remove all the if's for this. libvirt-lock-sanlock was renamed to libvirt-daemon-plugin-sanlock since libvirt 9.1, so adjust requirement. Signed-off-by: Jean-Louis Dupond <jean-louis@dupond.be>
1 parent d3e5d98 commit df472e5

File tree

1 file changed

+11
-101
lines changed

1 file changed

+11
-101
lines changed

vdsm.spec.in

Lines changed: 11 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: Red Hat, Inc.
1+
# SPDX-FileCopyrightText: oVirt Developers
22
# SPDX-License-Identifier: GPL-2.0-or-later
33

44
# Packages names
@@ -37,11 +37,7 @@
3737
%{!?enable_autotools:%global enable_autotools 0}
3838

3939
# Required paths
40-
%if 0%{?fedora}
41-
%global _polkitdir %{_datadir}/polkit-1/rules.d
42-
%else
4340
%global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
44-
%endif
4541
%global _vdsm_log_dir %{_localstatedir}/log/%{vdsm_name}
4642

4743
# Disable debuginfo package, since vdsm is a meta-package
@@ -114,23 +110,20 @@ Requires: virt-v2v
114110
Requires: chrony
115111
Requires: crontabs
116112
Requires: which
117-
Requires: sudo >= 1.7.3
113+
Requires: sudo
118114
Requires: logrotate
119115
Requires: lshw
120116
Requires: lsof
121117
Requires: ndctl
122118
Requires: swtpm-tools
123119
Requires: xz
120+
Requires: python3 >= 3.6
124121
Requires: python3-rpm
125122
Requires: python3-requests
126123
Requires: curl
127124
Requires: %{name}-http = %{version}-%{release}
128125
Requires: %{name}-jsonrpc = %{version}-%{release}
129-
%if 0%{?rhel} >= 8
130-
Requires: safelease >= 1.0.1-1.el8ev
131-
%else
132-
Requires: safelease >= 1.0-7
133-
%endif
126+
Requires: safelease
134127
Requires: mom >= 0.5.14
135128
Requires: util-linux
136129
Requires(pre): shadow-utils
@@ -149,80 +142,39 @@ Requires: ovirt-imageio-daemon >= 2.2.0-1
149142
Requires: ovirt-vmconsole >= 1.0.0-0
150143
%endif
151144

152-
Requires: python3 >= 3.6
153145

154146
Requires: libvirt-client
155147
Requires: libvirt-daemon-config-nwfilter
156-
Requires: libvirt-lock-sanlock
157-
# Zero-copy migrations, https://bugzilla.redhat.com/2089434
158-
Requires: libvirt-daemon-kvm >= 8.0.0-5.4.module+el8.6.0+16370+bb85faee
159-
%if 0%{?centos} == 8
148+
Requires: libvirt-daemon-plugin-sanlock
149+
Requires: libvirt-daemon-kvm
160150
Requires: python3-libvirt
161-
%else
162-
# VIR_MIGRATE_ZEROCOPY flag, https://bugzilla.redhat.com/2089434
163-
Requires: python3-libvirt >= 8.0.0-1.1.module+el8.6.0+16381+3abc475c
164-
%endif
165151

166152
# iscsi-intiator versions
167153
Requires: iscsi-initiator-utils >= 6.2.0.873-21
168154

169-
%if 0%{?rhel}
170-
# For https://bugzilla.redhat.com/1961752
155+
# sanlock
171156
Requires: python3-sanlock >= 3.8.3-3
172157
Requires: sanlock >= 3.8.3-3
173-
%endif
174158

175159
Requires: device-mapper-multipath
176160

177161
# augeas
178-
179-
%if 0%{?rhel}
180162
Requires: python3-augeas
181-
%endif
182163

183164
# fence-agents
184-
185-
%if 0%{?centos}
186-
# TODO: Require 4.2.1-53+ when CentOS 8.3 is released
187165
Requires: fence-agents-all
188-
%else
189-
# fence-agents package without telnet dependency
190-
Requires: fence-agents-all >= 4.2.1-53
191-
%endif
192-
193-
%if 0%{?fedora}
194-
Requires: python3-augeas
195-
%endif
196166

197167
Requires: python3-policycoreutils
198168
Requires: systemd >= 219-11
199-
Requires: initscripts >= 9.49.31
169+
Requires: initscripts
200170
Requires: cyrus-sasl-scram
201-
%if 0%{?fedora}
202-
# Required for solving bug 1575762
203-
Requires: lvm2 >= 2.02.177-5
204-
%else
205-
# EL 8.1 baseline.
206-
Requires: lvm2 >= 8:2.03
207-
%endif
208-
209-
# EL 8.4 baseline
210-
Requires: kernel >= 4.18.0-305
171+
Requires: lvm2
211172

212173
Requires: e2fsprogs
213174
Requires: selinux-policy-targeted
214175

215-
%if 0%{?fedora}
216-
Requires: ed
217-
Requires: sed
218-
Requires: policycoreutils
219-
Requires: python3-policycoreutils
220-
%endif
221-
222176
# qemu-kvm
223-
224-
# Zero-copy migrations, https://bugzilla.redhat.com/2089434
225-
Requires: qemu-kvm >= 15:6.2.0-11.module+el8.6.0+16360+9e5d914e.4
177+
Requires: qemu-kvm
226178

227179
# GlusterFS client-side RPMs needed for Gluster SD
228180
# Only include on EL < 10 where GlusterFS is available
@@ -236,51 +188,24 @@ Requires: glusterfs-fuse >= %{gluster_version}
236188
Requires: psmisc >= 22.6-15
237189

238190
# Make sure we require sos version which includes VDSM plugin
239-
%if 0%{?centos} || 0%{?fedora}
240-
# Currently we are without sos VDSM plugin on CentOS/Fedora:
241-
# - CentOS: When 7.7 is released, we also need to require 3.7-3+
242-
# - Fedora: When sos 3.7.1/3.8 is relased, we need to require it
243191
Requires: sos
244-
%else
245-
# RHEL
246-
%if 0%{?rhel} >= 8
247-
Requires: sos >= 3.7-1
248-
%else
249-
Requires: sos >= 3.7-3
250-
%endif
251-
%endif
252192

253193
Requires: tree
254194
Requires: dosfstools
255-
%if 0%{?rhel} >= 9
256-
# xorriso replaced genisoimage on RHEL 9
257195
Requires: xorriso
258-
%else
259-
Requires: genisoimage
260-
%endif
261196
Requires: python3-libselinux
262197
Requires: %{name}-python = %{version}-%{release}
263198
Requires: libguestfs-tools-c
264199

265200
Requires(post): /usr/sbin/saslpasswd2
266-
267-
%if 0%{?fedora} || 0%{?rhel} >= 8
268201
Requires(post): hostname
269-
%else
270-
# RHEL/CentOS 7
271-
Requires(post): /bin/hostname
272-
%endif
202+
273203

274204
# SecureBoot & q35, supported by x86_64 and aarch64; no ppc64le support at
275205
# the moment.
276206
%ifarch x86_64 %{arm}
277-
%if 0%{?rhel}
278-
Requires: OVMF
279-
%else
280-
# fedora
281207
Requires: edk2-ovmf
282208
%endif
283-
%endif
284209

285210
Conflicts: ovirt-hosted-engine-ha < 2.3.6
286211

@@ -362,12 +287,7 @@ Requires: systemd
362287
Requires: glibc
363288
Requires: python3-dbus
364289
Requires: python3-dateutil
365-
%if 0%{?rhel}
366-
Requires: python3-decorator
367-
%endif
368-
%if 0%{?fedora}
369290
Requires: python3-decorator
370-
%endif
371291

372292
%description common
373293
VDSM libraries that are imported by all subsystems
@@ -379,19 +299,9 @@ Requires: NetworkManager-ovs
379299
Requires: ethtool
380300
Requires: iproute
381301
Requires: iproute-tc
382-
%if 0%{?rhel} >= 9
383302
Requires: ovirt-openvswitch >= 2.17
384-
# Workaround for BZ#1966143
385303
Requires: ovirt-python-openvswitch >= 2.17
386-
%else
387-
Requires: ovirt-openvswitch >= 2.15
388-
# Workaround for BZ#1966143
389-
Requires: ovirt-python-openvswitch >= 2.15
390-
%endif
391304
Requires: nmstate >= 1.2.1-3
392-
%if 0%{?rhel} < 9
393-
Requires: nmstate-plugin-ovsdb
394-
%endif
395305
Requires: python3-libnmstate
396306
Requires: libnl3
397307
Requires: lldpad

0 commit comments

Comments
 (0)