Related: rhbz#2121654 Work around pkgconfig(libpq) conflict

...between libpq-devel and postgresql-private-devel, so that the BuildRequires:
pkgconfig(libpq) would now erroneously pick up postgresql-private-devel rather
than libpq-devel at least on F36 (and which causes trouble when trying to do a
LibreOffice flatpak build, which only bundles libpq but not
postgresql-private-libs)

(cherry picked from commit 98b9b9b60e381737e4451f772e53e49d4c1998a9)
f41
Stephan Bergmann 2 years ago
parent 9beb64f525
commit 5f24abf444

@ -138,6 +138,7 @@ BuildRequires: firebird-devel
BuildRequires: glm-devel BuildRequires: glm-devel
BuildRequires: hyphen-devel BuildRequires: hyphen-devel
BuildRequires: libjpeg-turbo-devel BuildRequires: libjpeg-turbo-devel
BuildRequires: libpq-devel
BuildRequires: lpsolve-devel BuildRequires: lpsolve-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: pam-devel BuildRequires: pam-devel
@ -170,7 +171,6 @@ BuildRequires: pkgconfig(libmspub-0.1)
BuildRequires: pkgconfig(libmwaw-0.3) BuildRequires: pkgconfig(libmwaw-0.3)
BuildRequires: pkgconfig(libodfgen-0.1) BuildRequires: pkgconfig(libodfgen-0.1)
BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(libpq)
BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(librevenge-0.0)
BuildRequires: pkgconfig(libstaroffice-0.0) BuildRequires: pkgconfig(libstaroffice-0.0)
BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libtiff-4)

Loading…
Cancel
Save