Hello community,
here is the log from the commit of package amarok
checked in at Wed Jul 5 15:12:33 CEST 2006.
--------
--- KDE/amarok/amarok.changes 2006-07-03 18:08:14.000000000 +0200
+++ amarok/amarok.changes 2006-07-05 15:08:52.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 5 14:39:53 CEST 2006 - adrian@suse.de
+
+- drop helix support on request from Beineri
+- add iPod/iRiver support via libnjb/gpod
+
+-------------------------------------------------------------------
Old:
----
helix-aoss-workaround.diff
helix-makefile64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.b1dSJC/_old 2006-07-05 15:12:01.000000000 +0200
+++ /var/tmp/diff_new_pack.b1dSJC/_new 2006-07-05 15:12:01.000000000 +0200
@@ -17,6 +17,7 @@
BuildRequires: update-desktop-files
%else
BuildRequires: gstreamer010-plugins-base-devel
+BuildRequires: libgpod-devel libnjb-devel
%endif
URL: http://amarok.kde.org
License: GPL
@@ -25,7 +26,7 @@
Group: Productivity/Multimedia/Sound/Players
Summary: Media Player for KDE
Version: 1.4.1
-Release: 1
+Release: 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define mversion 0.5
Source0: %name-%version.tar.bz2
@@ -35,10 +36,7 @@
Patch3: amarok-no-realaudio.diff
Patch4: threading-issues.diff
Patch6: amarok.diff
-Patch7: helix-helper-makefile.patch
-Patch8: helix-makefile64.patch
Patch10: default-engine.diff
-Patch11: helix-aoss-workaround.diff
Patch12: collectiondb-mutex.diff
%description
@@ -75,46 +73,6 @@
Stanislav Karchebny
%endif
-%package helix-backend
-Group: Productivity/Multimedia/Sound/Players
-Summary: Helix/RealPlayer engine for Amarok
-
-%description helix-backend
-The Helix player engine enables Amarok to play medias via plugins which
-may get provided by the Helix player or the RealPlayer from Real Media.
-
-
-
-Authors:
---------
- Christian Muehlhaeuser
- Mark Kretschmann
- Max Howell
- Stanislav Karchebny
-
-%package helix
-Group: Productivity/Multimedia/Sound/Players
-Summary: Helix/RealPlayer engine for Amarok
-Requires: rvplayer
-Requires: amarok = %version
-%ifarch x86_64 ppc64 ia64
-Requires: amarok-helix-backend
-%endif
-Provides: amarok_engine
-
-%description helix
-The Helix player engine enables Amarok to play medias via plugins which
-may get provided by the Helix player or the RealPlayer from Real Media.
-
-
-
-Authors:
---------
- Christian Muehlhaeuser
- Mark Kretschmann
- Max Howell
- Stanislav Karchebny
-
%package xine
Group: Productivity/Multimedia/Sound/Players
Summary: Xine Output Plugin for Amarok
@@ -170,18 +128,11 @@
%setup -q -n %name-%version
cd amarok
%patch1
-%ifarch %ix86 ppc
-%patch7
-%endif
-%ifarch x86_64 ppc64 ia64
-#%patch8
-%endif
cd ..
%patch3
%patch4
%patch6
%patch10
-%patch11
%patch12
cp %{S:10} amarok/src/engine/helix/
. /etc/opt/kde3/common_options
@@ -202,9 +153,6 @@
%endif
--with-gstreamer10 \
--with-xine \
-%ifarch %ix86 ppc x86_64 ppc64 ia64
- --with-helix=/usr/lib/RealPlayer10 \
-%endif
--disable-final
make %{?jobs:-j%jobs}
@@ -255,6 +203,12 @@
%if %suse_version < 921
%doc %lang(pt_BR) /opt/kde3/share/doc/HTML/pt_BR
%endif
+%if %suse_version > 1000
+/opt/kde3/%_lib/kde3/libamarok_ipod-mediadevice.*
+/opt/kde3/%_lib/kde3/libamarok_njb-mediadevice.*
+/opt/kde3/share/services/amarok_ipod-mediadevice.desktop
+/opt/kde3/share/services/amarok_njb-mediadevice.desktop
+%endif
%if %suse_version > 910
%files xine
@@ -263,20 +217,6 @@
/opt/kde3/%_lib/kde3/libamarok_xine-engine.*
/opt/kde3/share/services/amarok_xine-engine.desktop
%endif
-%ifarch %ix86 x86_64 ppc ppc64 ia64
-
-%files helix
-%defattr(-,root,root)
-/opt/kde3/share/config.kcfg/helixconfig.kcfg
-/opt/kde3/%_lib/kde3/libamarok_helixengine_plugin.*
-/opt/kde3/share/services/amarok_helixengine_plugin.desktop
-%endif
-%ifarch %ix86 ppc
-
-%files helix-backend
-%defattr(-,root,root)
-/opt/kde3/bin/amarok-helix-helper
-%endif
%if 0
%files gstreamer
@@ -297,6 +237,9 @@
%endif
%changelog -n amarok
+* Wed Jul 05 2006 - adrian@suse.de
+- drop helix support on request from Beineri
+- add iPod/iRiver support via libnjb/gpod
* Mon Jul 03 2006 - adrian@suse.de
- update to version 1.4.1
- libvisual 0.4 is needed now, support disabled for < 10.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org