From 5f24abf44481224b7ebe4fd486fd86596b935ca4 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 26 Aug 2022 13:07:11 +0200 Subject: [PATCH] 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) --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index d6e93cc..2ff35d0 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -138,6 +138,7 @@ BuildRequires: firebird-devel BuildRequires: glm-devel BuildRequires: hyphen-devel BuildRequires: libjpeg-turbo-devel +BuildRequires: libpq-devel BuildRequires: lpsolve-devel BuildRequires: openldap-devel BuildRequires: pam-devel @@ -170,7 +171,6 @@ BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) BuildRequires: pkgconfig(libodfgen-0.1) BuildRequires: pkgconfig(libpagemaker-0.0) -BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(libstaroffice-0.0) BuildRequires: pkgconfig(libtiff-4)