From 8ea582809d471b144e389d57ea94ae1d1ab5557efc4703ffc8c8ad3cd9d363bd Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sun, 10 Apr 2016 12:36:16 +0000 Subject: [PATCH] Accepting request 386799 from home:pluskalm:branches:server:database OBS-URL: https://build.opensuse.org/request/show/386799 OBS-URL: https://build.opensuse.org/package/show/server:database/sqlitebrowser?expand=0&rev=18 --- sqlitebrowser.changes | 3 ++- sqlitebrowser.spec | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sqlitebrowser.changes b/sqlitebrowser.changes index 848e7b1..5ac17f5 100644 --- a/sqlitebrowser.changes +++ b/sqlitebrowser.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Sun Apr 10 09:28:05 UTC 2016 - mpluskal@suse.com +Sun Apr 10 09:55:39 UTC 2016 - mpluskal@suse.com - Drop some build dependencies * autotools are not used @@ -7,6 +7,7 @@ Sun Apr 10 09:28:05 UTC 2016 - mpluskal@suse.com - Add correct dependencies for post/postun macros - Use cmake macros - Drop some conditional build dependencies for unsupported releases +- Build with qt5 where possible ------------------------------------------------------------------- Sat Apr 9 15:32:00 UTC 2016 - mailaender@opensuse.org diff --git a/sqlitebrowser.spec b/sqlitebrowser.spec index d0b89e2..5ca2c7f 100644 --- a/sqlitebrowser.spec +++ b/sqlitebrowser.spec @@ -28,21 +28,22 @@ Source1: sqlitebrowser.1 BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: sqlite3-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(sqlite3) Requires(post): hicolor-icon-theme Requires(post): update-desktop-files Requires(postun): hicolor-icon-theme Requires(postun): update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1320 +# not on SLE-12 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: libqt5-linguist-devel BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(glib-2.0) %else BuildRequires: libqt4-devel %endif @@ -71,7 +72,7 @@ to: %build %cmake \ - %if 0%{?suse_version} > 1320 + %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} -DUSE_QT5=true \ %endif -DCMAKE_BUILD_TYPE=RelWithDebInfo