Accepting request 858312 from multimedia:apps
OBS-URL: https://build.opensuse.org/request/show/858312 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/strawberry?expand=0&rev=32
This commit is contained in:
commit
99a9aef4fd
@ -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>
|
Sat Dec 19 16:50:36 UTC 2020 - Jonas Kvinge <jonas@jkvinge.net>
|
||||||
|
|
||||||
|
@ -36,16 +36,28 @@ BuildRequires: libboost_headers-devel
|
|||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: update-desktop-files
|
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: cmake(Qt5LinguistTools)
|
||||||
BuildRequires: pkgconfig(Qt5Concurrent)
|
BuildRequires: cmake(Qt5Network)
|
||||||
BuildRequires: pkgconfig(Qt5Core)
|
BuildRequires: cmake(Qt5Sql)
|
||||||
BuildRequires: pkgconfig(Qt5DBus)
|
BuildRequires: cmake(Qt5Test)
|
||||||
BuildRequires: pkgconfig(Qt5Gui)
|
BuildRequires: cmake(Qt5Widgets)
|
||||||
BuildRequires: pkgconfig(Qt5Network)
|
BuildRequires: cmake(Qt5X11Extras)
|
||||||
BuildRequires: pkgconfig(Qt5Sql)
|
%endif
|
||||||
BuildRequires: pkgconfig(Qt5Test)
|
|
||||||
BuildRequires: pkgconfig(Qt5Widgets)
|
|
||||||
BuildRequires: pkgconfig(Qt5X11Extras)
|
|
||||||
BuildRequires: pkgconfig(alsa)
|
BuildRequires: pkgconfig(alsa)
|
||||||
BuildRequires: pkgconfig(dbus-1)
|
BuildRequires: pkgconfig(dbus-1)
|
||||||
BuildRequires: pkgconfig(gio-2.0)
|
BuildRequires: pkgconfig(gio-2.0)
|
||||||
@ -70,7 +82,11 @@ BuildRequires: pkgconfig(protobuf)
|
|||||||
BuildRequires: pkgconfig(sqlite3) >= 3.9
|
BuildRequires: pkgconfig(sqlite3) >= 3.9
|
||||||
BuildRequires: pkgconfig(taglib) >= 1.11.1
|
BuildRequires: pkgconfig(taglib) >= 1.11.1
|
||||||
|
|
||||||
|
%if 0%{?suse_version} > 1530
|
||||||
|
Requires: qt6-sql-sqlite
|
||||||
|
%else
|
||||||
Requires: libQt5Sql5-sqlite
|
Requires: libQt5Sql5-sqlite
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Strawberry is a music player and music collection organizer.
|
Strawberry is a music player and music collection organizer.
|
||||||
@ -101,8 +117,13 @@ Features:
|
|||||||
%build
|
%build
|
||||||
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||||
export CXXFLAGS="$CFLAGS"
|
export CXXFLAGS="$CFLAGS"
|
||||||
%cmake -DBUILD_WERROR=OFF -DUSE_SYSTEM_TAGLIB=ON
|
%cmake -DBUILD_WERROR=OFF -DUSE_SYSTEM_TAGLIB=ON \
|
||||||
make %{?_smp_mflags}
|
%if 0%{?suse_version} > 1530
|
||||||
|
-DQT_MAJOR_VERSION=6
|
||||||
|
%else
|
||||||
|
-DQT_MAJOR_VERSION=5
|
||||||
|
%endif
|
||||||
|
%cmake_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%cmake_install
|
%cmake_install
|
||||||
|
Loading…
Reference in New Issue
Block a user