From a53b1764002132af39d85abda5cb803904427fb4 Mon Sep 17 00:00:00 2001
From: cgiboudeaux <>
Date: Nov 15 2022 13:09:23 +0000
Subject: Update amarok to version 2.9.75git.20221114T020258~457db492b4 / rev 134 via SR 1035634
https://build.opensuse.org/request/show/1035634
by user cgiboudeaux + dimstar_suse
New snapshot
---
diff --git a/.files b/.files
index 78d2a4d..6f5d48b 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index f744512..1be8941 100644
--- a/.rev
+++ b/.rev
@@ -1213,4 +1213,12 @@ https://git.reviewboard.kde.org/r/104878/ (forwarded request 116659 from StefanB
needs more work.
1007389
+
+ b99f560f426d75cf1f09ca3bd39ba35c
+ 2.9.75git.20221114T020258~457db492b4
+
+ dimstar_suse
+ New snapshot
+ 1035634
+
diff --git a/.servicemark b/.servicemark
index 152a27e..4bf96f8 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-873c6234cdf45f975df81365a9bdbdcc
+3e1e39e898cb404110359fe22ed09f93
diff --git a/_servicedata b/_servicedata
index d13ddc0..d2049c0 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://invent.kde.org/multimedia/amarok.git
- dc55a00143379c9e0406e2fa96bb32de65b14bd6
\ No newline at end of file
+ 457db492b455973076a93cd1188b4e98fa750457
\ No newline at end of file
diff --git a/amarok-2.9.75git.20220614T014846~dc55a00143.tar.xz b/amarok-2.9.75git.20220614T014846~dc55a00143.tar.xz
deleted file mode 120000
index 04cc312..0000000
--- a/amarok-2.9.75git.20220614T014846~dc55a00143.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeibcosaiivgltkb7lmpth7jstitlyi64732ui3zvrvhwc72ew3ow6e
\ No newline at end of file
diff --git a/amarok-2.9.75git.20221114T020258~457db492b4.tar.xz b/amarok-2.9.75git.20221114T020258~457db492b4.tar.xz
new file mode 120000
index 0000000..1ba4b05
--- /dev/null
+++ b/amarok-2.9.75git.20221114T020258~457db492b4.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeifl3poozplj6tbb355xidxenrx53jeypepd4bfk5gsk3r3ft34d2q
\ No newline at end of file
diff --git a/amarok-lang.tar.xz b/amarok-lang.tar.xz
deleted file mode 120000
index 6aa314b..0000000
--- a/amarok-lang.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeidbw4eykvym7erqorppt4ukrysn6r3ohiv6d5h7km6p2ymoxlu7ce
\ No newline at end of file
diff --git a/amarok.changes b/amarok.changes
index 4a006d2..b6fee2a 100644
--- a/amarok.changes
+++ b/amarok.changes
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Mon Nov 14 11:53:34 UTC 2022 - christophe@krop.fr
+
+- Update to version 2.9.75git.20221114T020258~457db492b4:
+ * Use VERSION_LESS to compare versions, not STRLESS
+ * remove test for ecm version which breaks on 5.100 and just
+ depend on newer ecm version
+ * Install translations
+ * Added mandatory AppStream metadata
+ * Remove CTest/CDash config again
+ * KDE CI: fix phonon reference
+ * Use non-deprecated KDEInstallDirs variables
+ * Complete port away from QTEST_KDEMAIN
+ * Use more nullptr
+ * Mark include directories for libraries as SYSTEM
+ * Port away from deprecated KMessageBox::sorry
+ * Change org.kde.amarok.desktop in order to use "true" instead of
+ "True"
+
+-------------------------------------------------------------------
Sat Oct 1 07:24:56 UTC 2022 - Christophe Giboudeaux
- Use FFmpeg 4 to build amarok on Tumbleweed. The FFmpeg 5 port
diff --git a/amarok.spec b/amarok.spec
index 18a44d7..eb1b039 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -17,14 +17,13 @@
Name: amarok
-Version: 2.9.75git.20220614T014846~dc55a00143
+Version: 2.9.75git.20221114T020258~457db492b4
Release: 0
Summary: Media Player
License: GPL-2.0-or-later
Group: Productivity/Multimedia/Sound/Players
URL: https://amarok.kde.org/
Source0: %{name}-%{version}.tar.xz
-Source1: %{name}-lang.tar.xz
# PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctrippe@gmx.net -- Support for the changed mimetype for flac files
Patch1: flac_mimetype_bnc671581.diff
# PATCH-FIX-OPENSUSE
@@ -110,7 +109,6 @@ BuildRequires: pkgconfig(zlib)
Requires: kirigami2
Requires: libqt5-qtquickcontrols2
Requires: libtag-extras1 >= 1.0
-Recommends: %{name}-lang = %{version}
Recommends: moodbar
Recommends: (gstreamer-plugins-ugly if phonon4qt5-backend-gstreamer)
@@ -122,10 +120,7 @@ Vorbis, audio CDs, podcasts and streams. Play lists can be stored in
%lang_package
%prep
-%autosetup -p1 -a1
-cat >> CMakeLists.txt << EOF
-ki18n_install(po)
-EOF
+%autosetup -p1
%build
%ifarch ppc ppc64
@@ -137,9 +132,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%install
%kf5_makeinstall -C build
-%find_lang amarok %{name}.lang
-%find_lang amarokcollectionscanner_qt %{name}.lang
-%find_lang amarokpkg %{name}.lang
+%find_lang %{name} --all-name --with-qt
%suse_update_desktop_file org.kde.amarok
%suse_update_desktop_file org.kde.amarok_containers
diff --git a/flac_mimetype_bnc671581.diff b/flac_mimetype_bnc671581.diff
index 0fbfca4..f357b7e 100644
--- a/flac_mimetype_bnc671581.diff
+++ b/flac_mimetype_bnc671581.diff
@@ -1,11 +1,10 @@
Make amarok able to open .flac files (boo#671581)
-
diff --git a/src/org.kde.amarok.desktop b/src/org.kde.amarok.desktop
-index 9181733..63ca433 100644
+index a4b859d..1ab5964 100644
--- a/src/org.kde.amarok.desktop
+++ b/src/org.kde.amarok.desktop
@@ -194,7 +194,7 @@ Icon=amarok
- SingleMainWindow=True
+ SingleMainWindow=true
# Add pure audio formats here, for other formats see amarok_*.desktop files
# See bug 242292
-MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-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;