From e5a09ccbcb9b6e1fe78a29ad71a535deabaf16370f5be36cc0593d7b0bc99347 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Wed, 30 Aug 2017 14:24:38 +0000
Subject: [PATCH] - Correct license - Use more cmake macros - Use shared
 qscintilla library

OBS-URL: https://build.opensuse.org/package/show/server:database/sqlitebrowser?expand=0&rev=30
---
 sqlitebrowser.changes |  7 +++++++
 sqlitebrowser.spec    | 34 ++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/sqlitebrowser.changes b/sqlitebrowser.changes
index 2dcf2d2..3772e7f 100644
--- a/sqlitebrowser.changes
+++ b/sqlitebrowser.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 30 14:24:07 UTC 2017 - mpluskal@suse.com
+
+- Correct license
+- Use more cmake macros
+- Use shared qscintilla library
+
 -------------------------------------------------------------------
 Tue Aug 29 16:59:44 UTC 2017 - wbauer@tmo.at
 
diff --git a/sqlitebrowser.spec b/sqlitebrowser.spec
index 77a3b65..98e5a2d 100644
--- a/sqlitebrowser.spec
+++ b/sqlitebrowser.spec
@@ -20,31 +20,32 @@ Name:           sqlitebrowser
 Version:        3.10.0
 Release:        0
 Summary:        Create, design and edit SQLite Databases
-License:        GPL-3.0+ or MPL-2.0
+License:        GPL-3.0+ AND MPL-2.0
 Group:          Productivity/Office/Organizers
 Url:            http://sqlitebrowser.org/
 Source0:        https://github.com/sqlitebrowser/sqlitebrowser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        sqlitebrowser.1
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  update-desktop-files
-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
-# not on SLE-12
-%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
-BuildRequires:  antlr-devel
-%endif
+BuildRequires:  libqscintilla_qt5-devel
 BuildRequires:  libqt5-linguist-devel
+BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5PrintSupport)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Widgets)
 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
+# not on SLE-12
+%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
+BuildRequires:  antlr-devel
+%endif
 
 %description
 SQLite Database Browser is a freeware, public domain, open source visual tool
@@ -69,9 +70,11 @@ to:
 %setup -q
 
 %build
-%cmake -DBUILD_SHARED_LIBS=OFF
-
-make %{?_smp_mflags}
+%cmake \
+  -DQSCINTILLA_INCLUDE_DIR=%{_includedir}/qt5/Qsci \
+  -DQSCINTILLA_LIBRARY=%{_libdir}/libqscintilla2_qt5.so \
+  -Wno-dev
+%make_jobs
 
 %install
 %cmake_install
@@ -100,7 +103,6 @@ EOF
 %icon_theme_cache_postun
 
 %files
-%defattr(-,root,root)
 %doc README.md LICENSE currentrelease
 %{_mandir}/man1/%{name}.1%{ext_man}
 %{_bindir}/%{name}