From 73acf16de7a20ef46f0291f8e26be4b0b20e7a9c1158bbb417dbc326dd89440d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 29 Apr 2015 08:23:16 +0000 Subject: [PATCH] Accepting request 304464 from home:elvigia:branches:server:database - Use QT5 for Factory builds - Honour RPM_OPT_FLAGS. OBS-URL: https://build.opensuse.org/request/show/304464 OBS-URL: https://build.opensuse.org/package/show/server:database/sqlitebrowser?expand=0&rev=11 --- sqlitebrowser.changes | 6 ++++++ sqlitebrowser.spec | 21 +++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/sqlitebrowser.changes b/sqlitebrowser.changes index 785e527..81fc27f 100644 --- a/sqlitebrowser.changes +++ b/sqlitebrowser.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 28 21:32:32 UTC 2015 - crrodriguez@opensuse.org + +- Use QT5 for Factory builds +- Honour RPM_OPT_FLAGS. + ------------------------------------------------------------------- Thu Apr 2 07:09:42 UTC 2015 - mpluskal@suse.com diff --git a/sqlitebrowser.spec b/sqlitebrowser.spec index 76a56d7..67aca67 100644 --- a/sqlitebrowser.spec +++ b/sqlitebrowser.spec @@ -35,10 +35,18 @@ BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: libQtWebKit-devel -BuildRequires: libqt4-devel >= 4.6 BuildRequires: sqlite3-devel BuildRequires: update-desktop-files +%if 0%{?suse_version} > 1320 +BuildRequires: libqt5-linguist-devel +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Widgets) +%else +BuildRequires: libqt4-devel +%endif %if 0%{?suse_version} > 1100 BuildRequires: pkgconfig(glib-2.0) %endif @@ -67,8 +75,13 @@ to: %setup -q -n sqlitebrowser-sqlitebrowser-0ddf048 %build -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} . -make %{?_smp_mflags} +export CXXFLAGS="%optflags" +cmake \ +%if 0%{?suse_version} > 1320 +-DUSE_QT5=true \ +%endif +-DCMAKE_INSTALL_PREFIX=%{_prefix} . +make %{?_smp_mflags} VERBOSE=1 %install make DESTDIR="%{buildroot}" install