commit amarok for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package amarok for openSUSE:Factory checked in at 2016-04-17 22:17:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/amarok (Old)
and /work/SRC/openSUSE:Factory/.amarok.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok"
Changes:
--------
--- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2016-03-02 14:21:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2016-04-17 22:17:21.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Apr 12 21:36:08 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Copy download icon from Breeze on Leap 42.1 and Tumbleweed
+
+-------------------------------------------------------------------
+Sat Apr 9 15:04:41 UTC 2016 - wbauer@tmo.at
+
+- Add Fix-for-infinite-loop-with-some-Audio-CDs.patch to fix the
+ infinite loop in case a home-burned or old audio CD (without
+ CDTEXT) is inserted (kde#339190)
+
+-------------------------------------------------------------------
New:
----
Fix-for-infinite-loop-with-some-Audio-CDs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.Q7zi77/_old 2016-04-17 22:17:23.000000000 +0200
+++ /var/tmp/diff_new_pack.Q7zi77/_new 2016-04-17 22:17:23.000000000 +0200
@@ -57,6 +57,8 @@
# PATCH-FIX-UPSTREAM Enable_Wikipedia_over_SSL.patch boo#934730, kde#349313 - Unbreak Wikipedia applet by enabling SSL
Patch109: Enable_Wikipedia_over_SSL.patch
Patch110: amarok-ffmpeg3.0.patch
+# PATCH-FIX-UPSTREAM Fix-for-infinite-loop-with-some-Audio-CDs.patch kde#339190 -- Fix for the infinite loop in case a home-burned or old audio CD is inserted
+Patch111: Fix-for-infinite-loop-with-some-Audio-CDs.patch
# Required for the fdupes macro
BuildRequires: fdupes
BuildRequires: gdk-pixbuf-devel
@@ -76,7 +78,11 @@
BuildRequires: libqt4-devel >= 4.8.2
BuildRequires: libxml2-devel
BuildRequires: loudmouth-devel
+%if 0%{?is_opensuse}
+BuildRequires: breeze5-icons
+%else
BuildRequires: oxygen-icon-theme
+%endif
BuildRequires: qt4-qtscript
BuildRequires: taglib
BuildRequires: taglib-devel >= 1.7
@@ -124,6 +130,7 @@
%patch108 -p1
%patch109 -p1
%patch110 -p0
+%patch111 -p1
# Remove build time references so build-compare can do its work
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE99} '+%%b %%e %%Y')
@@ -146,12 +153,21 @@
#bnc722284 amarok is not really a good player for audio-cds, remove the action for solid
rm -f %{buildroot}%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
+%if 0%{?is_opensuse}
+# Copy the icon for amzdownloader over from breeze
+for i in 16 22 24
+do
+ mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions
+ cp %{_kde4_iconsdir}/breeze/actions/${i}/download.svg %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions/
+done
+%else
# Copy the icon for amzdownloader over from oxygen
for i in 16 22 32 48
do
mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions
cp %{_kde4_iconsdir}/oxygen/${i}x${i}/actions/download.png %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions/
done
+%endif
%suse_update_desktop_file amarok Qt KDE AudioVideo Audio Player
%suse_update_desktop_file -r amzdownloader Qt KDE AudioVideo Audio Player
@@ -204,7 +220,7 @@
%{_datadir}/dbus-1/interfaces/org.kde.amarok.Mpris2Extensions.Player.xml
%{_datadir}/mime/packages/amzdownloader.xml
%{_kde4_iconsdir}/hicolor/*/apps/amarok.*
-%{_kde4_iconsdir}/hicolor/*/actions/download.png
+%{_kde4_iconsdir}/hicolor/*/actions/download.*
%{_kde4_appsdir}/amarok/
%dir %{_kde4_appsdir}/desktoptheme
%dir %{_kde4_appsdir}/desktoptheme/default
++++++ Fix-for-infinite-loop-with-some-Audio-CDs.patch ++++++
From: Stefano Pettini
participants (1)
-
root@hilbert.suse.de