diff --git a/multimedia/strawberry/strawberry.spec b/multimedia/strawberry/strawberry.spec index d7a2dc2..f81b851 100644 --- a/multimedia/strawberry/strawberry.spec +++ b/multimedia/strawberry/strawberry.spec @@ -1,8 +1,8 @@ -%bcond_without qt6 +%bcond_with clang Name: strawberry -Version: 1.1.3 -Release: 1%{?dist} +Version: 1.2.2 +Release: 2%{?dist} Summary: Audio player and music collection organizer # Main program: GPLv3 @@ -13,13 +13,17 @@ Summary: Audio player and music collection organizer # src/core/timeconstants.h and ext/libstrawberry-common/core/logging and ext/libstrawberry-common/core/messagehandler: ASL 2.0 License: GPLv2 and GPLv3+ amd LGPLv2 and ASL 2.0 and MIT and Boost URL: http://www.strawberrymusicplayer.org/ -Source0: https://files.strawberrymusicplayer.org/%{name}-%{version}.tar.xz +Source0: https://github.com/strawberrymusicplayer/strawberry/releases/download/%{version}/%{name}-%{version}.tar.xz BuildRequires: boost1.81-devel BuildRequires: cmake BuildRequires: desktop-file-utils -BuildRequires: gcc-c++ +%if %{with clang} +BuildRequires: clang +%else +BuildRequires: gcc-toolset-14-gcc-c++ +%endif BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: pkgconfig(alsa) @@ -43,10 +47,11 @@ BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libudf) BuildRequires: pkgconfig(protobuf) >= 3.11 BuildRequires: pkgconfig(libebur128) +BuildRequires: pkgconfig(icu-uc) +BuildRequires: pkgconfig(icu-i18n) -%if %{with qt6} BuildRequires: cmake(Qt6Concurrent) -BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Core) >= 6.4 BuildRequires: cmake(Qt6DBus) BuildRequires: cmake(Qt6Gui) BuildRequires: cmake(Qt6LinguistTools) @@ -54,22 +59,10 @@ 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(Qt5Network) -BuildRequires: cmake(Qt5Sql) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(Qt5X11Extras) -BuildRequires: qt5-linguist -%endif + BuildRequires: pkgconfig(sqlite3) >= 3.7 -BuildRequires: pkgconfig(taglib) >= 1.11 +BuildRequires: pkgconfig(taglib) >= 1.12 BuildRequires: utf8cpp-devel %ifnarch s390 s390x BuildRequires: pkgconfig(libgpod-1.0) @@ -121,24 +114,27 @@ Features: # # Unbundle taglib next release: # # https://github.com/taglib/taglib/issues/837#issuecomment-428389347 # mv 3rdparty/singleapplication/ . -# rm -fr 3rdparty/* +#rm -fr 3rdparty/* # mv singleapplication/ 3rdparty/ # # mv 3rdparty/singleapplication/LICENSE 3rdparty/singleapplication/LICENSE-singleapplication # #mv 3rdparty/taglib/COPYING 3rdparty/taglib/COPYING-taglib %build -export CFLAGS="%{optflags} -fno-strict-aliasing" +# qt 6.8+ requires std=c++17 +%if %{with clang} +export CC=clang +export CXX=clang++ +%else +%enable_devtoolset14 +%endif + +export CFLAGS="%{optflags} -fno-strict-aliasing -DQT_NO_DEBUG_OUTPUT" export CXXFLAGS="$CFLAGS" %{cmake} \ -DBUILD_WERROR:BOOL=OFF \ -DCMAKE_BUILD_TYPE:STRING=Release \ -%if %{with qt6} - -DQT_MAJOR_VERSION=6 \ -%else - -DQT_MAJOR_VERSION=5 \ -%endif . %cmake_build @@ -154,14 +150,26 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.strawberry %license COPYING %doc Changelog %{_bindir}/strawberry -%{_bindir}/strawberry-tagreader +#{_bindir}/strawberry-tagreader %{_metainfodir}/org.strawberrymusicplayer.strawberry.appdata.xml %{_datadir}/applications/org.strawberrymusicplayer.strawberry.desktop %{_datadir}/icons/hicolor/*/apps/strawberry.* %{_mandir}/man1/strawberry.1.* -%{_mandir}/man1/strawberry-tagreader.1.* +#{_mandir}/man1/strawberry-tagreader.1.* %changelog +* Thu Dec 5 2024 Raven - 1.2.2-2 +- rebuilt for qt6 (el8) + +* Tue Nov 26 2024 Raven - 1.2.2-1 +- Release 1.2.2 + +* Fri Nov 22 2024 Raven - 1.2.1-1 +- Release 1.2.1 + +* Wed Oct 16 2024 Raven - 1.1.3-2 +- rebuilt for qt6 (el8) + * Mon Sep 23 2024 Raven - 1.1.3-1 - Release 1.1.3