[rpms/amarok] epel10.2: - amarok-1.86 (amarok2 alpha 2)

[rpms/amarok] epel10.2: - amarok-1.86 (amarok2 alpha 2)

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : c33ec75f5319000c175cd74bb441821a8f8e936c
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2008-07-22T19:39:28+00:00
Stats  : +81/-376 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/c33ec75f5319000c175cd74bb441821a8f8e936c?branch=epel10.2

Log:
- amarok-1.86 (amarok2 alpha 2)

---
diff --git a/.cvsignore b/.cvsignore
index a088b44..91e0380 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-1.4.9.1.tar.bz2
+amarok-1.86.tar.bz2

diff --git a/amarok-1.4.7-xdg.patch b/amarok-1.4.7-xdg.patch
deleted file mode 100644
index 1fa6ff8..0000000
--- a/amarok-1.4.7-xdg.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up amarok-1.4.7/amarok/src/Options1.ui.h~ amarok-1.4.7/amarok/src/Options1.ui.h
---- amarok-1.4.7/amarok/src/Options1.ui.h~	2007-08-07 20:48:28.000000000 +0300
-+++ amarok-1.4.7/amarok/src/Options1.ui.h	2007-10-02 22:45:03.000000000 +0300
-@@ -27,8 +27,8 @@ void Options1::init()
-     //slotUpdateRatingsFrame();
- 
-     QStringList browsers;
--    browsers << "konqueror" << "firefox" << "opera" << "galeon" << "epiphany"
--             << "safari" << "mozilla";
-+    browsers << "xdg-open" << "konqueror" << "firefox" << "opera" << "galeon"
-+             << "epiphany" << "safari" << "mozilla";
- 
-     // Remove browsers which are not actually installed
-     for( QStringList::Iterator it = browsers.begin(), end = browsers.end(); it != end; ) {
-@@ -41,8 +41,8 @@ void Options1::init()
-     if ( KStandardDirs::findExe( "open" ) != QString::null )
-         browsers.prepend( i18n( "Default Browser" ) );
- #else
--    if ( KStandardDirs::findExe( "kfmclient" ) != QString::null )
--        browsers.prepend( i18n( "Default KDE Browser" ) );
-+    if ( KStandardDirs::findExe( "xdg-open" ) != QString::null )
-+        browsers.prepend( i18n( "Default Browser" ) );
- #endif
- 
-     kComboBox_browser->insertStringList( browsers );
-@@ -54,7 +54,7 @@ void Options1::init()
- #ifdef Q_WS_MAC
-             "open"
- #else
--            "kfmclient openURL"
-+            "xdg-open"
- #endif
-       )
-     {

diff --git a/amarok-1.4.8-gcc43.patch b/amarok-1.4.8-gcc43.patch
deleted file mode 100644
index 8b0c781..0000000
--- a/amarok-1.4.8-gcc43.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp
---- amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp	2008-02-21 21:05:18.000000000 -0600
-@@ -30,6 +30,7 @@ email                : aumuell@reserv.at
- #include <audioproperties.h>
- 
- #include <stdint.h>
-+#include <cstdlib>
- 
- #define MP4V2_HAS_WRITE_BUG 1
- 
-diff -up amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp
---- amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp	2008-02-21 21:05:18.000000000 -0600
-@@ -24,6 +24,7 @@
- 
- #include "taglib_mp4filetyperesolver.h"
- #include "mp4file.h"
-+#include <cstring>
- 
- TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
-         bool readProperties,
-diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp
---- amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp	2008-02-21 21:05:18.000000000 -0600
-@@ -24,6 +24,8 @@ email                : andrew.leadbetter
- 
- #include <tag.h>
- #include <stdint.h>
-+#include <cstdlib>
-+#include <cstring>
- 
- using namespace TagLib;
- 
-diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp
---- amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp	2008-02-21 21:05:18.000000000 -0600
-@@ -30,6 +30,7 @@ email                : andrew.leadbetter
- #endif
- 
- #include <stdint.h>
-+#include <cstring>
- 
- #ifndef UINT64_TO_DOUBLE
- #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
-diff -up amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp
---- amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43	2007-12-17 09:53:18.000000000 -0600
-+++ amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp	2008-02-21 21:07:10.000000000 -0600
-@@ -15,6 +15,8 @@
-  the alsa guys
-  ***************************************************************************/
- 
-+#include <cstdlib>
-+#include <cstring>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-diff -up amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h
---- amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43	2007-12-17 09:53:18.000000000 -0600
-+++ amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h	2008-02-21 21:07:54.000000000 -0600
-@@ -23,6 +23,7 @@ class HelixSimplePlayerAudioStreamInfoRe
- #include <limits.h>
- #include <sys/param.h>
- #include <pthread.h>
-+#include <cstring>
- #include <vector>
- #include <config.h>
- #include <iostream>
-diff -up amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp
---- amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43	2007-12-17 09:53:18.000000000 -0600
-+++ amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp	2008-02-21 21:09:38.000000000 -0600
-@@ -15,6 +15,7 @@
- #include <climits>
- #include <cmath>
- #include <stdarg.h>
-+#include <cstring>
- 
- #include <config.h>
- 

diff --git a/amarok.spec b/amarok.spec
index a8eeffc..0a7f499 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,107 +1,47 @@
-# TODO:
-# Rio Karma support : libkarma
-
-%if 0%{?fedora} < 9
-# define to include konquisidebar support for kde3 desktop
-%define konq 1
-%endif
-
-%if 0%{?fedora} > 6 
-# suffix for kde3 -devel packages
-%define kde3 3
-%endif
-
-%if 0%{?fedora} > 6
-# Helix engine on archs where it is available
-%ifnarch ppc64 x86_64 s390 s390x ia64 sparcv9 sparc64 alpha
-# consider omitting helix support, srsly, does *anyone* use it? -- Rex
-%define _with_helix --with-helix=%{_libdir}/helix
-%endif
-%endif
-
-%if 0%{?fedora}
-%define _with_ifp --with-ifp
-%define _with_libgpod --with-libgpod
-%define _with_libmtp --with-libmtp
-%define _with_libnjb --with-libnjb
-%define _with_libvisual --with-libvisual
-%define _with_mp4v2 --with-mp4v2
-%endif
-
-Name:       amarok
-Summary:    Media player
-Version:    1.4.9.1
-Release:    4%{?dist}
-
-Group: 	    Applications/Multimedia
-License:    GPLv2+
-Url:        http://amarok.kde.org
-Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Patch1:     amarok-1.4.8-gcc43.patch
-# Use xdg-open to start the selected browser
-Patch2:     amarok-1.4.7-xdg.patch
-
-BuildRequires:  alsa-lib-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  esound-devel
-BuildRequires:  gettext
-%{?_with_helix:BuildRequires:  HelixPlayer}
-BuildRequires:  kdelibs%{?kde3}-devel
-%if 0%{?konq}
-BuildRequires:  kdebase%{?kde3}-devel
-%else
-Obsoletes: %{name}-konqueror < %{version}-%{release}
-%endif
-BuildRequires:  taglib-devel 
-%{?_with_ifp:BuildRequires:  libifp-devel}
-# Ipod
-%{?_with_libgpod:BuildRequires:  libgpod-devel}
-%{?_with_mp4v2:BuildRequires: libmp4v2-devel}
-# MTP players
-%{?_with_libmtp:BuildRequires:  libmtp-devel}
-BuildRequires:  libmusicbrainz-devel
-# Creative Nomad Jukebox
-%{?_with_libnjb:BuildRequires:  libnjb-devel}
-BuildRequires:  libtool
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires:  libtool-ltdl-devel
-%endif
-BuildRequires:  libtunepimp-devel
-BuildRequires:  libusb-devel
-%{?_with_libvisual:BuildRequires:  libvisual-devel}
-BuildRequires:  mysql-devel
-BuildRequires:  postgresql-devel
-BuildRequires:  ruby-devel ruby
-BuildRequires:  SDL-devel
-BuildRequires:  taglib-devel
-BuildRequires:  xine-lib-devel
-# not used anymore, in favor of libvisual ? -- Rex
-#%{?fedora:BuildRequires:  xmms-devel}
-
-# For dir ownership and some default plugins (lyrics), -ruby subpkg?  -- Rex
-Requires:  ruby
-
-# To open the selected browser, works with Patch2
-Requires:  xdg-utils
+
+Name:    amarok
+Summary: Media player
+Version: 1.86 
+Release: 1%{?dist}
+
+Group: 	 Applications/Multimedia
+License: GPLv2+
+Url:     http://amarok.kde.org/
+Source0: http://download.kde.org/unstable/amarok/1.86/src/amarok-1.86.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: alsa-lib-devel
+BuildRequires: curl-devel
+BuildRequires: desktop-file-utils
+BuildRequires: esound-devel
+BuildRequires: gettext
+# FIXME: giflib-devel bogus dep, from where?
+BuildRequires: giflib-devel
+BuildRequires: kdelibs4-devel
+BuildRequires: kdebase-workspace-devel
+BuildRequires: kdemultimedia-devel
+BuildRequires: libifp-devel
+BuildRequires: libgpod-devel
+BuildRequires: libmp4v2-devel
+BuildRequires: libmtp-devel
+BuildRequires: libmusicbrainz-devel
+BuildRequires: libnjb-devel
+BuildRequires: libtunepimp-devel
+BuildRequires: libusb-devel
+BuildRequires: libvisual-devel
+BuildRequires: libxml2-devel
+BuildRequires: loudmouth-devel
+BuildRequires: mysql-devel
+BuildRequires: soprano-devel
+BuildRequires: taglib-devel
+
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
-
 Obsoletes: amarok-devel < %{version}-%{release}
-%if 0%{?fedora} > 6 && 0%{?fedora} < 9
-# need to keep this around for previous releases, so not to break multilib compat.
-Provides:  amarok-devel = %{version}-%{release}
-%endif
-
-# engines, etc...
-# old, obsolete ones: arts, akode
-Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
-# xine-lib
-Provides: %{name}-engine-xine = %{version}-%{release}
-
+Obsoletes: amarok-konqueror < 1.5
+Obsoletes: amarok-visualisation < 1.5
 
 %description
 Amarok is a multimedia player with:
@@ -111,199 +51,77 @@ Amarok is a multimedia player with:
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
-%if 0%{?_with_helix:1}
-Amarok can use various engines to decode sound : helix and xine.
-To use the helix engine, you need to install either HelixPlayer
-or RealPlayer
-%endif
-
-%package konqueror
-Summary: Amarok konqueror (service menus, sidebar) support
-Group:   Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-%description konqueror
-%{summary}.
-
-%if 0%{?_with_libvisual:1}
-%package visualisation
-Summary:    Visualisation plugins for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}-%{release}
-# No plugins by default, we need libvisual-plugins
-Requires:   libvisual-plugins
-%description visualisation
-Amarok can use visualisation plugins from different origins.
-Right now, only xmms is supported, which means that you can
-use any of xmms' visualisation plugins with Amarok.
-%endif
-
 
 %prep
 %setup -q 
 
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .xdg
-
 
 %build
-unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
-
-%configure \
-     --disable-debug --disable-warnings \
-     --disable-rpath \
-     --enable-mysql \
-     --enable-postgresql \
-     %{?_with_helix} %{!?_with_helix:--without-helix} \
-     %{?_with_ifp} %{!?_with_ifp:--without-ifp} \
-     %{?_with_libgpod} %{!?_with_libgpod:--without-libgpod} \
-     %{?_with_libmtp} %{!?_with_libmtp:--without-libmtp} \
-     %{?_with_libnjb} %{!?_with_libnjb:--without-libnjb}  \
-     %{?_with_libvisual} %{!?_with_libvisual:--without-libvisual} \
-     %{?_with_mp4v2} %{!?_with_mp4v2:--without-mp4v2}
-
-#     --enable-final \
-#     --with-nmm \
-#     --with-mas
-
-# fails with smp flags
-#make %{?_smp_mflags}
-make
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -fr $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+rm -rf %{buildroot}
+
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # desktop files
 desktop-file-install  --vendor "" \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-        --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
+  --dir %{buildroot}%{_kde4_datadir}/applications/kde4 \
+  --delete-original \
+  %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+
+%find_lang amarok || touch amarok.lang
 
 # unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%if ! 0%{?konq}
-rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%endif
+rm -f %{buildroot}%{_kde4_libdir}/lib*.so
 
 
-%find_lang %{name} 
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    [ "$lang" == "en" ] && d=en/%{name} || d=$lang
-    echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
-  fi
-done
+%clean
+rm -rf %{buildroot}
 
 
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
-%clean
-rm -fr $RPM_BUILD_ROOT
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
-%{_bindir}/amarok
-%{_bindir}/amarokapp
-%{_bindir}/amarokcollectionscanner
-%{_bindir}/amarok_proxy.rb
-%{_datadir}/apps/amarok/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/servicetypes/*.desktop
-%{_datadir}/apps/profiles/amarok.profile.xml
-%{_datadir}/config/amarokrc
-%{_datadir}/config.kcfg/*.kcfg
-%{_datadir}/services/amarokitpc.protocol
-%{_datadir}/services/amaroklastfm.protocol
-%{_datadir}/services/amarokpcast.protocol
-# -libs ?  -- Rex
-%{_libdir}/libamarok.*
-# -ruby ? -- Rex
-%{_libdir}/ruby_lib/*
-# DAAP
-%{_bindir}/amarok_daapserver.rb
-%{_libdir}/kde3/libamarok_daap-mediadevice.*
-%{_datadir}/services/amarok_daap-mediadevice.desktop
-# Mass-storage
-%{_datadir}/services/amarok_massstorage-device.desktop
-%{_libdir}/kde3/libamarok_massstorage-device.*
-# NFS
-%{_datadir}/services/amarok_nfs-device.desktop
-%{_libdir}/kde3/libamarok_nfs-device.*
-# SMB
-%{_datadir}/services/amarok_smb-device.desktop
-%{_libdir}/kde3/libamarok_smb-device.*
-%if 0%{?_with_libgpod:1}
-# IPod
-%{_datadir}/services/amarok_ipod-mediadevice.desktop
-%{_libdir}/kde3/libamarok_ipod-mediadevice.*
-%endif
-# VFAT
-%{_datadir}/services/amarok_generic-mediadevice.desktop
-%{_libdir}/kde3/libamarok_generic-mediadevice.*
-%if 0%{?_with_ifp:1}
-# iRiver
-%{_datadir}/services/amarok_ifp-mediadevice.desktop
-%{_libdir}/kde3/libamarok_ifp-mediadevice.*
-%endif
-%if 0%{?_with_libnjb:1}
-# Creative Zen
-%{_datadir}/services/amarok_njb-mediadevice.desktop
-%{_libdir}/kde3/libamarok_njb-mediadevice.*
-%endif
-%if 0%{?_with_libmtp:1}
-# MTP players
-%{_datadir}/services/amarok_mtp-mediadevice.desktop
-%{_libdir}/kde3/libamarok_mtp-mediadevice.*
-%endif
-# Rio Karma
-#%{_datadir}/services/amarok_riokarma-mediadevice.desktop
-#%{_libdir}/kde3/libamarok_riokarma-mediadevice.*
-# Void engine (noop)
-%{_datadir}/services/amarok_void-engine_plugin.desktop
-%{_libdir}/kde3/libamarok_void-engine_plugin.*
-# Xine engine
-%{_datadir}/services/amarok_xine-engine.desktop
-%{_libdir}/kde3/libamarok_xine-engine.*
-## Gstreamer engine
-#%{_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{_libdir}/kde3/libamarok_gst10engine_plugin.*
-# Helix engine
-%if 0%{?_with_helix:1}
-%{_libdir}/kde3/libamarok_helixengine_plugin.*
-%{_datadir}/services/amarok_helixengine_plugin.desktop
-%endif
-
-%if 0%{?konq}
-%files konqueror
-%defattr(-,root,root,-)
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_libdir}/kde3/konqsidebar_universalamarok.*
-%{_datadir}/apps/konqsidebartng/*/amarok.desktop
-%endif
-
-%if 0%{?_with_libvisual:1}
-%files visualisation
+%files -f amarok.lang
 %defattr(-,root,root,-)
-%{_bindir}/amarok_libvisual
-%endif
+%doc AUTHORS COPYING ChangeLog README
+%{_kde4_bindir}/*
+%{_kde4_appsdir}/amarok/
+%{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
+%{_kde4_appsdir}/desktoptheme/amarok-default.desktop
+%{_kde4_appsdir}/desktoptheme/default/widgets/*
+%{_kde4_configdir}/*
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_datadir}/config.kcfg/*
+%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/strigi/*
+%{_datadir}/dbus-1/interfaces/*.xml
 
 
 %changelog
+* Tue Jul 22 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.86-1
+- amarok-1.86 (amarok2 alpha 2)
+
 * Wed Jun 11 2008 Dennis Gilmore <dennis@ausil.us> - 1.4.9.1-4
 - we are building sparc32 as sparcv9 not sparc now  fix ifnarch
 

diff --git a/sources b/sources
index 5dda56e..e70322d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aa588778379a391ad3f4b3fc770217e4  amarok-1.4.9.1.tar.bz2
+acf43672687a5f261ce36d668338a4c1  amarok-1.86.tar.bz2