]> git.ipfire.org Git - thirdparty/rrdtool-1.x.git/commitdiff
ci(release): fix RPM python binding and DEB libxml2 dep on new distros
authorTobias Oetiker <tobi@oetiker.ch>
Tue, 19 May 2026 08:09:17 +0000 (10:09 +0200)
committerTobias Oetiker <tobi@oetiker.ch>
Tue, 19 May 2026 08:09:17 +0000 (10:09 +0200)
Two release-blocking failures surfaced when the package matrix gained
AlmaLinux 10 and Ubuntu 26.04:

- AlmaLinux 10 (Python 3.12) no longer bundles setuptools with
  python3-devel, so the python binding failed with 'The setup requires
  setuptools'. Add python3-setuptools to the RPM build-dep list; it is
  harmless on EL8/EL9 and needed on Fedora too.

- Ubuntu 26.04 bumped libxml2 to 2.14 and renamed the runtime package
  from 'libxml2' to 'libxml2-16'. Make the fpm dependency an
  alternative ('libxml2-16 | libxml2') so apt resolves it on every
  distro in the matrix.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
.github/workflows/release.yml

index b2b47cc72148dcbd82d7c968af6d8d94bb9e4be2..5c0e70d34e1dbda10d6b13078ab69cfacd1f30a4 100644 (file)
@@ -300,7 +300,7 @@ jobs:
               freetype-devel libpng-devel zlib-devel \
               libxml2-devel glib2-devel libdbi-devel \
               perl-devel perl-ExtUtils-MakeMaker \
-              python3-devel \
+              python3-devel python3-setuptools \
               tcl-devel \
               lua-devel \
               ruby ruby-devel
@@ -512,7 +512,7 @@ jobs:
               --description "Round Robin Database Tool (upstream /opt build). Source /opt/rrdtool/bin/rrdtool-env.sh to use." \
               --depends "libcairo2" \
               --depends "libpango-1.0-0" \
-              --depends "libxml2" \
+              --depends "libxml2-16 | libxml2" \
               --depends "libpng16-16" \
               --depends "libfreetype6" \
               --depends "libdbi1" \