Skip to content

Commit fa43359

Browse files
spec: fix el9 build on CBS
Building on CBS for el9 failed because of maven 3.8 being selected instead of maven 3.6. CBS EL9 builds for tags virt9s-ovirt-45* have set the value of block_maven_38 macro to 1 by default, but other build platforms are not affected by this. See also: https://bugzilla.redhat.com/show_bug.cgi?id=2128991 Signed-off-by: Sandro Bonazzola <[email protected]>
1 parent f797221 commit fa43359

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed

ovirt-engine.spec.in

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949
# Set "rhv_build 1" to perform RHV Manager build
5050
%global rhv_build 0
5151

52+
# Workaround for build issues on CBS due to https://bugzilla.redhat.com/2128991
53+
%if 0%{!?block_maven_38:1}
54+
%global block_maven_38 0
55+
%endif
56+
5257
#
5358
# CUSTOMIZATION-END
5459
#
@@ -234,6 +239,24 @@ BuildRequires: systemd
234239
BuildRequires: unzip
235240
BuildRequires: javapackages-local
236241

242+
243+
%if %{block_maven_38}
244+
# Block packages from maven:3.8 to pass CBS build due to https://bugzilla.redhat.com/2128991
245+
BuildRequires: maven < 1:3.8.0
246+
BuildRequires: maven-lib < 1:3.8.0
247+
BuildRequires: maven-resolver < 1:1.7.0
248+
BuildRequires: maven-shared-utils < 3.3.4-3
249+
BuildRequires: maven-wagon < 3.5.0
250+
BuildRequires: plexus-cipher < 1.8
251+
BuildRequires: plexus-classworlds < 2.6.0-11
252+
BuildRequires: plexus-containers-component-annotations < 2.1.1
253+
BuildRequires: plexus-interpolation < 1.26-11
254+
BuildRequires: plexus-sec-dispatcher < 1.5
255+
BuildRequires: plexus-utils < 3.3.0-10
256+
BuildRequires: sisu < 1:0.3.5
257+
%endif
258+
259+
237260
BuildRequires: ovirt-engine-build-dependencies >= 4.5.3
238261

239262
Requires(pre): shadow-utils

0 commit comments

Comments
 (0)