From 1d3fd0f904181013a813a35943368120862b4ae4 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Wed, 23 Sep 2026 14:19:24 +0200 Subject: [PATCH] Build-depend on minizip OpenModelica/build-deps#98 installs minizip and expat headers in every build image. Declare minizip here too, so `apt-get build-dep` and `dnf builddep` pull it in without the images' explicit lists. deb: libminizip-dev. libexpat1-dev was already listed. rpm: EL 8/9's minizip-devel is minizip-ng 2.x/3.x, a different API, so they take zlib's classic minizip1.2-devel from EPEL. EL 10 and Fedora no longer package it and get minizip-ng-compat-devel instead. expat-devel was already listed. Co-Authored-By: Claude Opus 5.5 --- debian/control | 1 + rpm/SPECS/openmodelica.spec.tpl | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/debian/control b/debian/control index 1236ecb..f11c28b 100644 --- a/debian/control +++ b/debian/control @@ -42,6 +42,7 @@ Build-Depends: debhelper-compat (= 13), liblapack-dev, libcurl4-gnutls-dev | libcurl-dev, libexpat1-dev, + libminizip-dev, libomp-dev, # Should be needed but seems to mess up sbuild # libexpat1-dev:native, diff --git a/rpm/SPECS/openmodelica.spec.tpl b/rpm/SPECS/openmodelica.spec.tpl index 8ee4c4b..a586ee3 100644 --- a/rpm/SPECS/openmodelica.spec.tpl +++ b/rpm/SPECS/openmodelica.spec.tpl @@ -61,6 +61,13 @@ BuildRequires: xz BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gcc-gfortran +# EL 8/9's minizip-devel is minizip-ng, a different API; EPEL has zlib's +# classic minizip. EL 10 and Fedora only have minizip-ng's compat layer. +%if 0%{?rhel} == 8 || 0%{?rhel} == 9 +BuildRequires: minizip1.2-devel +%else +BuildRequires: minizip-ng-compat-devel +%endif # EL8 is the only target left without qt6, in EPEL or anywhere else, and the # GUI clients no longer build against qt5: ship el8 without them. %if 0%{?rhel} == 8