From 98b9b9b60e381737e4451f772e53e49d4c1998a9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Aug 26 2022 11:07:11 +0000 Subject: 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) --- diff --git a/libreoffice.spec b/libreoffice.spec index bff27ab..9f86fca 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -137,6 +137,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 @@ -168,7 +169,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(libvisio-0.1)