From 815155c1de547d69707a7ff0ee109818bb6a1fba3dede3e4a6d143e72ee4dc35 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 28 Jun 2021 07:17:02 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kexi?expand=0&rev=27 --- kexi.changes | 5 +++++ kexi.spec | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kexi.changes b/kexi.changes index a0d6eb6..cb52bf3 100644 --- a/kexi.changes +++ b/kexi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 28 07:16:57 UTC 2021 - Christophe Giboudeaux + +- Remove the optional QtWebKit dependency. + ------------------------------------------------------------------- Wed Apr 28 05:49:16 UTC 2021 - Christophe Giboudeaux diff --git a/kexi.spec b/kexi.spec index 5a8d5d0..b25b39b 100644 --- a/kexi.spec +++ b/kexi.spec @@ -62,8 +62,6 @@ BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5UiTools) -BuildRequires: cmake(Qt5WebKit) -BuildRequires: cmake(Qt5WebKitWidgets) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) # For dir ownership From aab5386b3cf7f4280acbf6f9fed0da281806af88b7b2b4e04c790bf6eecc8898 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 28 Jun 2021 07:25:10 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kexi?expand=0&rev=28 --- kexi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kexi.spec b/kexi.spec index b25b39b..3be8ed5 100644 --- a/kexi.spec +++ b/kexi.spec @@ -78,7 +78,7 @@ BuildRequires: postgresql-server-devel BuildRequires: postgresql-devel %endif # Kexi needs breeze-icons.rcc during build and on runtime (it doesn't start without it installed) -%if 0%{?suse_version} > 1500 || "%{?_repository}" == "KDE_Applications_openSUSE_Leap_15.1" || "%{?_repository}" == "KDE_Applications_openSUSE_Leap_15.2" +%if 0%{?suse_version} > 1500 || "%{?_repository}" == "KDE_Applications_openSUSE_Leap_15.2" || "%{?_repository}" == "KDE_Applications_openSUSE_Leap_15.3" BuildRequires: breeze5-icons-rcc Requires: breeze5-icons-rcc %else From fe0ab6f3eb9977f1c0d952f97a46b3fa5bbb0f5e5b471c689b49f9be447186f6 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 28 Jun 2021 12:22:58 +0000 Subject: [PATCH 3/3] Accepting request 902805 from home:wolfi323:branches:KDE:Extra - BuildRequire postgresql-server-devel also on Leap 15.2/15.3 to fix missing PostgreSQL migration driver Similar to SR#785407 in kdb, but I decided to omit the %if completely as 15.1 is no longer supported. OBS-URL: https://build.opensuse.org/request/show/902805 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kexi?expand=0&rev=29 --- kexi.changes | 6 ++++++ kexi.spec | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/kexi.changes b/kexi.changes index cb52bf3..b49110b 100644 --- a/kexi.changes +++ b/kexi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 28 11:39:36 UTC 2021 - Wolfgang Bauer + +- BuildRequire postgresql-server-devel also on Leap 15.2/15.3 to + fix missing PostgreSQL migration driver + ------------------------------------------------------------------- Mon Jun 28 07:16:57 UTC 2021 - Christophe Giboudeaux diff --git a/kexi.spec b/kexi.spec index 3be8ed5..c3f34b1 100644 --- a/kexi.spec +++ b/kexi.spec @@ -38,6 +38,7 @@ BuildRequires: kproperty-devel BuildRequires: kreport-devel BuildRequires: libmysqld-devel BuildRequires: mysql-devel +BuildRequires: postgresql-server-devel BuildRequires: update-desktop-files BuildRequires: cmake(KF5Archive) BuildRequires: cmake(KF5Codecs) @@ -72,11 +73,6 @@ Obsoletes: calligra-kexi < %{version} Provides: calligra-kexi = %{version} # not ported yet Obsoletes: calligra-kexi-spreadsheet-import < %{version} -%if 0%{?suse_version} > 1500 -BuildRequires: postgresql-server-devel -%else -BuildRequires: postgresql-devel -%endif # Kexi needs breeze-icons.rcc during build and on runtime (it doesn't start without it installed) %if 0%{?suse_version} > 1500 || "%{?_repository}" == "KDE_Applications_openSUSE_Leap_15.2" || "%{?_repository}" == "KDE_Applications_openSUSE_Leap_15.3" BuildRequires: breeze5-icons-rcc