Skip to content

Commit

Permalink
spec: fix el9 build on CBS
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
sandrobonazzola committed Nov 30, 2023
1 parent f797221 commit fa43359
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions ovirt-engine.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
# Set "rhv_build 1" to perform RHV Manager build
%global rhv_build 0

# Workaround for build issues on CBS due to https://bugzilla.redhat.com/2128991
%if 0%{!?block_maven_38:1}
%global block_maven_38 0
%endif

#
# CUSTOMIZATION-END
#
Expand Down Expand Up @@ -234,6 +239,24 @@ BuildRequires: systemd
BuildRequires: unzip
BuildRequires: javapackages-local


%if %{block_maven_38}
# Block packages from maven:3.8 to pass CBS build due to https://bugzilla.redhat.com/2128991
BuildRequires: maven < 1:3.8.0
BuildRequires: maven-lib < 1:3.8.0
BuildRequires: maven-resolver < 1:1.7.0
BuildRequires: maven-shared-utils < 3.3.4-3
BuildRequires: maven-wagon < 3.5.0
BuildRequires: plexus-cipher < 1.8
BuildRequires: plexus-classworlds < 2.6.0-11
BuildRequires: plexus-containers-component-annotations < 2.1.1
BuildRequires: plexus-interpolation < 1.26-11
BuildRequires: plexus-sec-dispatcher < 1.5
BuildRequires: plexus-utils < 3.3.0-10
BuildRequires: sisu < 1:0.3.5
%endif


BuildRequires: ovirt-engine-build-dependencies >= 4.5.3

Requires(pre): shadow-utils
Expand Down

0 comments on commit fa43359

Please sign in to comment.