Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2024-05-02 23:46:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok" Thu May 2 23:46:46 2024 rev:139 rq:1171132 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2024-03-15 20:29:22.971886421 +0100 +++ /work/SRC/openSUSE:Factory/.amarok.new.1880/amarok.changes 2024-05-03 00:13:54.048201679 +0200 @@ -1,0 +2,8 @@ +Tue Apr 30 06:59:18 UTC 2024 - Christophe Marin <[email protected]> + +- Update to 3.0.0 + * https://blogs.kde.org/2024/04/29/amarok-3.0-castaway-released/ +- Drop patch, merged upstream: + * 0001-Use-non-deprecated-TagLib-functions-fix-build-with-T.patch + +------------------------------------------------------------------- Old: ---- 0001-Use-non-deprecated-TagLib-functions-fix-build-with-T.patch _service _servicedata amarok-2.9.75git.20230408T114133~7098c192a6.obscpio amarok.obsinfo New: ---- amarok-3.0.0.tar.xz amarok-3.0.0.tar.xz.sig amarok.keyring BETA DEBUG BEGIN: Old:- Drop patch, merged upstream: * 0001-Use-non-deprecated-TagLib-functions-fix-build-with-T.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.55LK0s/_old 2024-05-03 00:14:11.540839400 +0200 +++ /var/tmp/diff_new_pack.55LK0s/_new 2024-05-03 00:14:11.544839546 +0200 @@ -1,7 +1,7 @@ # # spec file for package amarok # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,101 +16,114 @@ # +%define kf5_version 5.77.0 +%define qt5_version 5.15.0 +%bcond_without released Name: amarok -Version: 2.9.75git.20230408T114133~7098c192a6 +Version: 3.0.0 Release: 0 Summary: Media Player License: GPL-2.0-or-later URL: https://amarok.kde.org/ -Source0: %{name}-%{version}.tar.xz +Source0: https://download.kde.org/stable/amarok/%{version}/%{name}-%{version}.tar.xz +%if %{with released} +Source1: https://download.kde.org/stable/amarok/%{version}/%{name}-%{version}.tar.xz.sig +# https://invent.kde.org/sysadmin/release-keyring/-/blob/master/keys/[email protected]?ref_type=heads +Source2: amarok.keyring +%endif # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 [email protected] -- Support for the changed mimetype for flac files -Patch1: flac_mimetype_bnc671581.diff +Patch0: flac_mimetype_bnc671581.diff # PATCH-FIX-OPENSUSE -Patch2: disable-web-plugins-by-default.patch +Patch1: disable-web-plugins-by-default.patch # PATCH-FIX-OPENSUSE -Patch3: 0001-Work-around-QTBUG-75797-for-openQA.patch -# PATCH-FIX-UPSTREAM -Patch4: 0001-Use-non-deprecated-TagLib-functions-fix-build-with-T.patch +Patch2: 0001-Work-around-QTBUG-75797-for-openQA.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: gdk-pixbuf-devel -BuildRequires: libgcrypt-devel BuildRequires: liblastfm-qt5-devel -BuildRequires: libmysqlclient-devel -BuildRequires: libmysqld-devel -BuildRequires: loudmouth-devel -BuildRequires: mysql +BuildRequires: libmariadbd-devel +BuildRequires: mariadb BuildRequires: pkgconfig -BuildRequires: update-desktop-files -BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5Attica) -BuildRequires: cmake(KF5Codecs) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5DNSSD) -BuildRequires: cmake(KF5Declarative) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5GlobalAccel) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5Package) -BuildRequires: cmake(KF5Solid) -BuildRequires: cmake(KF5TextEditor) -BuildRequires: cmake(KF5ThreadWeaver) -BuildRequires: cmake(KF5Wallet) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(Mygpo-qt5) +BuildRequires: python3 +BuildRequires: cmake(KF5Archive) >= %{kf5_version} +BuildRequires: cmake(KF5Attica) >= %{kf5_version} +BuildRequires: cmake(KF5Codecs) >= %{kf5_version} +BuildRequires: cmake(KF5Config) >= %{kf5_version} +BuildRequires: cmake(KF5ConfigWidgets) >= %{kf5_version} +BuildRequires: cmake(KF5CoreAddons) >= %{kf5_version} +BuildRequires: cmake(KF5Crash) >= %{kf5_version} +BuildRequires: cmake(KF5DBusAddons) >= %{kf5_version} +BuildRequires: cmake(KF5DNSSD) >= %{kf5_version} +BuildRequires: cmake(KF5Declarative) >= %{kf5_version} +BuildRequires: cmake(KF5DocTools) >= %{kf5_version} +BuildRequires: cmake(KF5GlobalAccel) >= %{kf5_version} +BuildRequires: cmake(KF5GuiAddons) >= %{kf5_version} +BuildRequires: cmake(KF5I18n) >= %{kf5_version} +BuildRequires: cmake(KF5IconThemes) >= %{kf5_version} +BuildRequires: cmake(KF5KCMUtils) >= %{kf5_version} +BuildRequires: cmake(KF5KIO) >= %{kf5_version} +BuildRequires: cmake(KF5NewStuff) >= %{kf5_version} +BuildRequires: cmake(KF5Notifications) >= %{kf5_version} +BuildRequires: cmake(KF5Package) >= %{kf5_version} +BuildRequires: cmake(KF5Solid) >= %{kf5_version} +BuildRequires: cmake(KF5TextEditor) >= %{kf5_version} +BuildRequires: cmake(KF5ThreadWeaver) >= %{kf5_version} +BuildRequires: cmake(KF5Wallet) >= %{kf5_version} +BuildRequires: cmake(KF5WidgetsAddons) >= %{kf5_version} +BuildRequires: cmake(KF5WindowSystem) >= %{kf5_version} +BuildRequires: cmake(Mygpo-qt5) >= 1.1.0 BuildRequires: cmake(Phonon4Qt5) -BuildRequires: cmake(Qca-qt5) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5QuickWidgets) -BuildRequires: cmake(Qt5Sql) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5UiTools) -%ifarch %{ix86} x86_64 %{arm} aarch64 -BuildRequires: cmake(Qt5WebEngine) +BuildRequires: cmake(Qt5Core) >= %{qt5_version} +BuildRequires: cmake(Qt5DBus) >= %{qt5_version} +BuildRequires: cmake(Qt5Gui) >= %{qt5_version} +BuildRequires: cmake(Qt5Qml) >= %{qt5_version} +BuildRequires: cmake(Qt5QuickWidgets) >= %{qt5_version} +BuildRequires: cmake(Qt5Sql) >= %{qt5_version} +BuildRequires: cmake(Qt5Svg) >= %{qt5_version} +BuildRequires: cmake(Qt5Test) >= %{qt5_version} +BuildRequires: cmake(Qt5UiTools) >= %{qt5_version} +%ifarch %{ix86} x86_64 %{x86_64} %{arm} aarch64 +BuildRequires: cmake(Qt5WebEngine) >= %{qt5_version} %endif -BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(Qt5Xml) +BuildRequires: cmake(Qt5Widgets) >= %{qt5_version} +BuildRequires: cmake(Qt5Xml) >= %{qt5_version} BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(libgpod-1.0) +BuildRequires: pkgconfig(libmariadb) BuildRequires: pkgconfig(libmtp) >= 1.0.0 BuildRequires: pkgconfig(libofa) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(loudmouth-1.0) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(taglib) +BuildRequires: pkgconfig(taglib) >= 1.12 +BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(zlib) -# needed by the context view -Requires: kirigami2 -Requires: libqt5-qtquickcontrols2 # phonon4qt5-backend-vlc is the backend name in Leap Requires: (phonon-vlc-qt5 or phonon4qt5-backend-vlc) -Recommends: moodbar +# needed by the context view +Requires: kirigami2 >= %{kf5_version} +Requires: libqt5-qtquickcontrols2 >= %{qt5_version} Recommends: (gstreamer-plugins-ugly if phonon4qt5-backend-gstreamer) +Recommends: moodbar %description Amarok is a media player for all kinds of media. This includes MP3, Ogg Vorbis, audio CDs, podcasts and streams. Play lists can be stored in .m3u or .pls files. +%package doc +Summary: Documentation for Amarok +# The english doc was split from the main package +Conflicts: amarok < %{version} + +%description doc +This package provides documentation for the Amarok media player. + %lang_package %prep @@ -121,17 +134,15 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif %cmake_kf5 -d build + %cmake_build %install %kf5_makeinstall -C build -%find_lang %{name} --all-name --with-qt +%find_lang %{name} --all-name --with-html --with-qt -%suse_update_desktop_file org.kde.amarok -%suse_update_desktop_file org.kde.amarok_containers - -%fdupes -s %{buildroot} +%fdupes %{buildroot} # E: devel-file-in-non-devel-package rm %{buildroot}%{_kf5_libdir}/libamarok{core,lib,shared,-sqlcollection,-transcoding}.so @@ -151,7 +162,6 @@ %{_kf5_configdir}/* %{_kf5_configkcfgdir}/ %{_kf5_dbusinterfacesdir}/ -%{_kf5_htmldir}/en/amarok/ %{_kf5_iconsdir}/hicolor/*/*/* %{_kf5_knsrcfilesdir}/amarok.knsrc %{_kf5_libdir}/libamarok-sqlcollection.so.* @@ -176,4 +186,8 @@ %{_kf5_sharedir}/solid/ %files lang -f %{name}.lang +%exclude %{_kf5_htmldir}/*/amarok/ + +%files doc +%{_kf5_htmldir}/*/amarok/ ++++++ disable-web-plugins-by-default.patch ++++++ --- /var/tmp/diff_new_pack.55LK0s/_old 2024-05-03 00:14:11.588841150 +0200 +++ /var/tmp/diff_new_pack.55LK0s/_new 2024-05-03 00:14:11.592841296 +0200 @@ -3,10 +3,10 @@ References: boo#1070899 diff --git a/src/services/lastfm/amarok_service_lastfm.desktop b/src/services/lastfm/amarok_service_lastfm.desktop -index 9f02d0e578..1c7276cfaa 100644 +index 8bce92c..ec01520 100644 --- a/src/services/lastfm/amarok_service_lastfm.desktop +++ b/src/services/lastfm/amarok_service_lastfm.desktop -@@ -117,6 +117,6 @@ [email protected] +@@ -123,6 +123,6 @@ [email protected] X-KDE-PluginInfo-Version=1.0 X-KDE-PluginInfo-Category=Service X-KDE-PluginInfo-License=GPL @@ -15,10 +15,10 @@ X-KDE-Library=amarok_service_lastfm X-KDE-PluginInfo-Name=amarok_service_lastfm diff --git a/src/services/magnatune/amarok_service_magnatunestore.desktop b/src/services/magnatune/amarok_service_magnatunestore.desktop -index 98fec83d53..5a3d4754e7 100644 +index 14cf601..e222621 100644 --- a/src/services/magnatune/amarok_service_magnatunestore.desktop +++ b/src/services/magnatune/amarok_service_magnatunestore.desktop -@@ -123,7 +123,7 @@ [email protected] +@@ -129,7 +129,7 @@ [email protected] X-KDE-PluginInfo-Version=2.0 X-KDE-PluginInfo-Category=Service X-KDE-PluginInfo-License=GPL ++++++ flac_mimetype_bnc671581.diff ++++++ --- /var/tmp/diff_new_pack.55LK0s/_old 2024-05-03 00:14:11.604841734 +0200 +++ /var/tmp/diff_new_pack.55LK0s/_new 2024-05-03 00:14:11.608841879 +0200 @@ -1,6 +1,7 @@ Make amarok able to open .flac files (boo#671581) + diff --git a/src/org.kde.amarok.desktop b/src/org.kde.amarok.desktop -index a4b859d..1ab5964 100644 +index 1a7588c..a7be5a8 100644 --- a/src/org.kde.amarok.desktop +++ b/src/org.kde.amarok.desktop @@ -194,7 +194,7 @@ Icon=amarok @@ -11,5 +12,5 @@ +MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg; X-DocPath=amarok/index.html X-KDE-Keywords=music,podcast - X-KDE-Keywords[bs]=muzika,podemisija + X-KDE-Keywords[bg]=music,podcast
