diff --git a/debian/changelog b/debian/changelog index 76f8aebb6..b2fbaad50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ freeipa (4.11.1-1) UNRELEASED; urgency=medium * control: Add sssd-passkey to freeipa-client Recommends. * control.server: Drop python3-paste from python3-ipatests depends, obsolete. + * control, rules: Replace hardcoded librpm9 depends. (Closes: + #1067570) -- Timo Aaltonen Wed, 18 Oct 2023 14:32:52 +0300 diff --git a/debian/control b/debian/control index 87e0d84b7..a4025d4f0 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,7 @@ Build-Depends: libldap2-dev, libnspr4-dev, libpopt-dev, + librpm-dev, libsasl2-dev, libssl-dev, libtalloc-dev, @@ -172,7 +173,6 @@ Depends: gpg, gpg-agent, keyutils, - librpm9, python3-cffi, python3-cryptography, python3-dbus, @@ -194,6 +194,7 @@ Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, + ${lib:Depends}, Description: FreeIPA centralized identity framework -- shared Python3 modules FreeIPA is an integrated solution to provide centrally managed Identity (machine, user, virtual machines, groups, authentication credentials), Policy diff --git a/debian/control.common b/debian/control.common index 48635bf55..54d10cafd 100644 --- a/debian/control.common +++ b/debian/control.common @@ -120,7 +120,6 @@ Depends: gpg, gpg-agent, keyutils, - librpm9, python3-cffi, python3-cryptography, python3-dbus, @@ -142,6 +141,7 @@ Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, + ${lib:Depends}, Description: FreeIPA centralized identity framework -- shared Python3 modules FreeIPA is an integrated solution to provide centrally managed Identity (machine, user, virtual machines, groups, authentication credentials), Policy diff --git a/debian/control.stub b/debian/control.stub index cd8b1c92b..f71cf7c18 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -22,6 +22,7 @@ Build-Depends: libldap2-dev, libnspr4-dev, libpopt-dev, + librpm-dev, libsasl2-dev, libssl-dev, libtalloc-dev, diff --git a/debian/rules b/debian/rules index b14be934c..bac5a0ba1 100755 --- a/debian/rules +++ b/debian/rules @@ -126,6 +126,11 @@ override_dh_fixperms: chmod 0700 $(CURDIR)/debian/freeipa-server/var/lib/ipa/backup; \ fi +override_dh_gencontrol: + dh_gencontrol -- \ + -Vlib:Depends=$(shell dpkg-query -W -f '$${Depends}' librpm-dev \ + | sed -E 's/.*(librpm[[:alnum:].-]+).*/\1/') + %: dh $@ --with python3 # --builddirectory=build