Skip to content

Commit c255628

Browse files
committed
staging:17/tarballs: percona-gis-compat — no %elif (EL8 rpm 4.14)
The RockyLinux_8 build of da1e31c failed with "error: line 75: Unknown tag: %elif 08 == 9": %elif landed in rpm 4.15, so EL8's rpm 4.14 cannot parse it (RockyLinux_9 built fine). Rewrite the per-base Provides block as nested %if/%else/%endif and note why. No functional change: rpmspec -P still yields proj = 6.3.2 / gdal-libs = 3.0.4 on EL8, proj = 9.6.0 / gdal3.4-libs = 3.4.3 on EL9, and %{error} on any other base. Signed-off-by: Ricardo Dias <ricardo.dias@percona.com>
1 parent da1e31c commit c255628

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

root/ppg/staging/17/tarballs/percona-gis-compat/rpm/percona-gis-compat.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,22 @@ BuildArch: noarch
6868
# percona-gdal/rpm/percona-gdal.spec (%%global gdal_version) for the same
6969
# base. PostGIS carries a VERSIONED `Requires: gdal*-libs >= 3.0.4`, so a
7070
# Provides: below that floor would leave the chroot unresolvable.
71+
# Nested %%if/%%else rather than %%elif: EL8 ships rpm 4.14, which has no
72+
# %%elif (added in rpm 4.15, i.e. EL9) and fails with "Unknown tag: %%elif".
7173
%if 0%{?rhel} == 8
7274
# percona-proj 6.3.2, percona-gdal 3.0.4 on EL8.
7375
Provides: proj = 6.3.2
7476
Provides: gdal-libs = 3.0.4
75-
%elif 0%{?rhel} == 9
77+
%else
78+
%if 0%{?rhel} == 9
7679
# percona-proj 9.6.0, percona-gdal 3.4.3 on EL9. The distro name is
7780
# gdal3.4-libs here (EPEL 9's compat GDAL for PostGIS).
7881
Provides: proj = 9.6.0
7982
Provides: gdal3.4-libs = 3.4.3
8083
%else
8184
%{error:percona-gis-compat: unsupported base (rhel=%{?rhel}); only EL8 and EL9 tarball chroots are defined}
8285
%endif
86+
%endif
8387

8488
# The real runtimes this shim stands in for.
8589
Requires: percona-gdal

0 commit comments

Comments
 (0)