From f510ecf7e02499cf43bba5d94e731953ed1d6e6859bcc1bccaa8797157ac31d5 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonaski@opensuse.org>
Date: Wed, 23 Dec 2020 08:17:49 +0000
Subject: [PATCH] Accepting request 858306 from
 home:jonaski:branches:multimedia:apps

- Use cmake_build macro
- Use Qt 6 on tumbleweed

OBS-URL: https://build.opensuse.org/request/show/858306
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/strawberry?expand=0&rev=88
---
 strawberry.changes |  6 ++++++
 strawberry.spec    | 39 ++++++++++++++++++++++++++++-----------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/strawberry.changes b/strawberry.changes
index cf0dc6e..c5ed05a 100644
--- a/strawberry.changes
+++ b/strawberry.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec 23 08:16:18 UTC 2020 - Jonas Kvinge <jonaski@opensuse.org>
+
+- Use cmake_build macro
+- Use Qt 6 on tumbleweed
+
 -------------------------------------------------------------------
 Sat Dec 19 16:50:36 UTC 2020 - Jonas Kvinge <jonas@jkvinge.net>
 
diff --git a/strawberry.spec b/strawberry.spec
index 9002109..8344191 100644
--- a/strawberry.spec
+++ b/strawberry.spec
@@ -36,16 +36,28 @@ BuildRequires:  libboost_headers-devel
 BuildRequires:  make
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
+%if 0%{?suse_version} > 1530
+BuildRequires:  cmake(Qt6Concurrent)
+BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6DBus)
+BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6LinguistTools)
+BuildRequires:  cmake(Qt6Network)
+BuildRequires:  cmake(Qt6Sql)
+BuildRequires:  cmake(Qt6Test)
+BuildRequires:  cmake(Qt6Widgets)
+%else
+BuildRequires:  cmake(Qt5Concurrent)
+BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5DBus)
+BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5LinguistTools)
-BuildRequires:  pkgconfig(Qt5Concurrent)
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5DBus)
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5Sql)
-BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  pkgconfig(Qt5X11Extras)
+BuildRequires:  cmake(Qt5Network)
+BuildRequires:  cmake(Qt5Sql)
+BuildRequires:  cmake(Qt5Test)
+BuildRequires:  cmake(Qt5Widgets)
+BuildRequires:  cmake(Qt5X11Extras)
+%endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -101,8 +113,13 @@ Features:
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 export CXXFLAGS="$CFLAGS"
-%cmake -DBUILD_WERROR=OFF -DUSE_SYSTEM_TAGLIB=ON
-make %{?_smp_mflags}
+%cmake -DBUILD_WERROR=OFF -DUSE_SYSTEM_TAGLIB=ON \
+%if 0%{?suse_version} > 1530
+       -DQT_MAJOR_VERSION=6
+%else
+       -DQT_MAJOR_VERSION=5
+%endif
+%cmake_build
 
 %install
 %cmake_install