Skip to content

Commit 27597f5

Browse files
authored
SPECS/trident: set TRIDENT_VERSION correctly for azl build (#16099)
1 parent 06c5757 commit 27597f5

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

SPECS/trident/trident.spec

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,13 @@ EOF
230230
%endif
231231

232232
%build
233+
%if %{undefined rpm_ver}
234+
# Use %{version}-%{release} for TRIDENT_VERSION in distro build
235+
export TRIDENT_VERSION="%{version}-%{release}"
236+
%else
237+
# Use %{trident_version} for Trident repo build
233238
export TRIDENT_VERSION="%{trident_version}"
239+
%endif
234240
cargo build --release
235241

236242
mkdir selinux
@@ -242,7 +248,15 @@ make -f %{_datadir}/selinux/devel/Makefile %{name}.pp
242248
bzip2 -9 %{name}.pp
243249

244250
%check
251+
# Test the trident variable for the appropiate version
252+
%if %{undefined rpm_ver}
253+
# Use %{version}-%{release} for TRIDENT_VERSION in distro build
254+
test "$(./target/release/trident --version)" = "trident %{version}-%{release}"
255+
%else
256+
# Use %{trident_version} for Trident repo build
245257
test "$(./target/release/trident --version)" = "trident %{trident_version}"
258+
%endif
259+
246260
%if %{undefined rpm_ver}
247261
%ifarch x86_64
248262
# Run unit tests as part of check for distro build, skip 3 tests that do not work

0 commit comments

Comments
 (0)