From 5b58ce0a4a818f61e077efaba45358c327c847bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 3 Feb 2022 16:29:45 +0100 Subject: [PATCH] RPM: fix dependencies to postgresql-devel in koffice and krecipes --- redhat/applications/koffice/koffice.spec | 4 ++++ redhat/applications/krecipes/krecipes.spec | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec index 81bf68605..a27bbc6f0 100644 --- a/redhat/applications/koffice/koffice.spec +++ b/redhat/applications/koffice/koffice.spec @@ -218,10 +218,14 @@ BuildRequires: trinity-poppler-devel >= 0.12 %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} %if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0 %define with_postgresql 1 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +BuildRequires: postgresql-server-devel +%else BuildRequires: postgresql-devel BuildRequires: libpqxx-devel %endif %endif +%endif Obsoletes: trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release} # WPD support diff --git a/redhat/applications/krecipes/krecipes.spec b/redhat/applications/krecipes/krecipes.spec index 69c3d81f8..c2b24ef16 100644 --- a/redhat/applications/krecipes/krecipes.spec +++ b/redhat/applications/krecipes/krecipes.spec @@ -79,7 +79,17 @@ BuildRequires: brp-check-trinity BuildRequires: mysql-devel # POSTGRESQL support -BuildRequires: postgresql-devel +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 +BuildRequires: postgresql10 +BuildRequires: postgresql10-devel +%else +BuildRequires: postgresql +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +BuildRequires: postgresql-server-devel +%else +BuildRequires: postgresql-devel +%endif +%endif # SQLITE support BuildRequires: sqlite-devel