summaryrefslogtreecommitdiffstats
path: root/mandriva/2010.2/applications/amarok
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-01-30 12:06:23 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-01-30 12:06:23 +0900
commit40be1ebef7a688235d4730561908a02f10505385 (patch)
treeab182bf59496abaee2ddbf03d3e910bd37ae57e8 /mandriva/2010.2/applications/amarok
parentc169e89296c2d885faa5cdeba21dc35b10b2f583 (diff)
downloadtde-packaging-40be1ebef7a688235d4730561908a02f10505385.tar.gz
tde-packaging-40be1ebef7a688235d4730561908a02f10505385.zip
Removed obsolete Mandriva 2010 packaging files.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'mandriva/2010.2/applications/amarok')
-rw-r--r--mandriva/2010.2/applications/amarok/Lyrics_CN-0.5.3.tar.bz2bin25025 -> 0 bytes
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-1.2-fix-config.patch11
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-1.3-fix-default-config.patch12
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-1.4-beta2-add-multimedia-shortcut.patch22
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-1.4.0-use-mandriva-directory.patch21
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-1.4.1-fix-initial-preference.patch11
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-add-radios.patch42
-rw-r--r--mandriva/2010.2/applications/amarok/fix-ifpdevice-build.patch1163
-rw-r--r--mandriva/2010.2/applications/amarok/kde3-amarok.spec638
9 files changed, 0 insertions, 1920 deletions
diff --git a/mandriva/2010.2/applications/amarok/Lyrics_CN-0.5.3.tar.bz2 b/mandriva/2010.2/applications/amarok/Lyrics_CN-0.5.3.tar.bz2
deleted file mode 100644
index fdc0264fa..000000000
--- a/mandriva/2010.2/applications/amarok/Lyrics_CN-0.5.3.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/mandriva/2010.2/applications/amarok/amarok-1.2-fix-config.patch b/mandriva/2010.2/applications/amarok/amarok-1.2-fix-config.patch
deleted file mode 100644
index 5f7ab5565..000000000
--- a/mandriva/2010.2/applications/amarok/amarok-1.2-fix-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- amarok-1.2/amarok/src/app.cpp-- 2005-02-15 11:43:26.600377969 +0100
-+++ amarok-1.2/amarok/src/app.cpp 2005-02-15 11:43:51.271844342 +0100
-@@ -81,7 +81,7 @@ App::App()
- // Remember old folder setup, so we can detect changes after the wizard was used
- const QStringList oldCollectionFolders = AmarokConfig::collectionFolders();
-
-- if ( amaroK::config()->readBoolEntry( "First Run", true ) || args->isSet( "wizard" ) ) {
-+ if ( amaroK::config()->readBoolEntry( "First Run", false ) || args->isSet( "wizard" ) ) {
- std::cout << "STARTUP\n" << std::flush; //hide the splashscreen
- firstRunWizard();
- amaroK::config()->writeEntry( "First Run", false );
diff --git a/mandriva/2010.2/applications/amarok/amarok-1.3-fix-default-config.patch b/mandriva/2010.2/applications/amarok/amarok-1.3-fix-default-config.patch
deleted file mode 100644
index b5b92ffc6..000000000
--- a/mandriva/2010.2/applications/amarok/amarok-1.3-fix-default-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- amarok/src/amarokrc-- 2005-06-08 14:31:48.532241213 +0200
-+++ amarok/src/amarokrc 2005-06-08 14:32:11.076771614 +0200
-@@ -8,6 +8,9 @@ CurrentPane=ContextBrowser
- #see PlaylistWidget::setColumnWidth() for explanation for below
- ColumnWidths=0,200,100,100,0,0,0,0,0,80,0
-
-+[Playback]
-+Sound System=xine-engine
-+
- [KNewStuff]
- TargetDir=amarok/themes
- Uncompress=application/x-gzip
diff --git a/mandriva/2010.2/applications/amarok/amarok-1.4-beta2-add-multimedia-shortcut.patch b/mandriva/2010.2/applications/amarok/amarok-1.4-beta2-add-multimedia-shortcut.patch
deleted file mode 100644
index 582ca50ad..000000000
--- a/mandriva/2010.2/applications/amarok/amarok-1.4-beta2-add-multimedia-shortcut.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur amarok-1.4.10/amarok/src/amarokrc amarok-1.4.10_yeni/amarok/src/amarokrc
---- amarok-1.4.10/amarok/src/amarokrc 2009-12-20 01:16:09.000000000 +0200
-+++ amarok-1.4.10_yeni/amarok/src/amarokrc 2009-12-20 01:19:33.994560100 +0200
-@@ -8,6 +8,18 @@
- #see PlaylistWidget::setColumnWidth() for explanation for below
- ColumnWidths=0,200,100,100,0,0,0,0,0,80,0
-
-+[Shortcuts]
-+voldn=Ctrl+Shift+KP_Subtract;XF86AudioLowerVolume
-+next=Ctrl+Shift+B;XF86AudioNext
-+osd=Ctrl+Shift+O;XF86Start
-+play_pause=Ctrl+Shift+P;XF86AudioPlay
-+prev=Ctrl+Shift+Z;XF86AudioPrev
-+stop=Ctrl+Shift+V;XF86AudioStop
-+volup=Ctrl+Shift+KP_Add;XF86AudioRaiseVolume
-+pause=Ctrl+Shift+C
-+play=Ctrl+Shift+X
-+show=Ctrl+Shift+W
-+
- [Playback]
- Sound System=xine-engine
-
diff --git a/mandriva/2010.2/applications/amarok/amarok-1.4.0-use-mandriva-directory.patch b/mandriva/2010.2/applications/amarok/amarok-1.4.0-use-mandriva-directory.patch
deleted file mode 100644
index 2e3699866..000000000
--- a/mandriva/2010.2/applications/amarok/amarok-1.4.0-use-mandriva-directory.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- amarok/src/filebrowser.cpp~ 2006-04-08 18:22:20.000000000 +0200
-+++ amarok/src/filebrowser.cpp 2006-04-11 13:52:36.000000000 +0200
-@@ -77,15 +77,16 @@
- // Try to keep filebrowser working even if not in a medium context
- // so if a medium object not passed in, keep earlier behavior
- if (!medium) {
-+ KGlobal::locale()->insertCatalogue("menu-messages-main");
- m_medium = 0;
-- location = new KURL( config->readPathEntry( "Location", QDir::homeDirPath() ) );
-+ location = new KURL( config->readPathEntry( "Location", QDir::homeDirPath()+"/"+i18n("Music")));
- currentFolder = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, *location );
- //KIO sucks, NetAccess::exists puts up a dialog and has annoying error message boxes
- //if there is a problem so there is no point in using it anyways.
- //so... setting the diroperator to ~ is the least sucky option
- if ( !location->isLocalFile() || !currentFolder->isReadable() ) {
- delete location;
-- location = new KURL( QDir::homeDirPath() ) ;
-+ location = new KURL( QDir::homeDirPath()+"/"+i18n("Music")) ;
- }
- }
- else{
diff --git a/mandriva/2010.2/applications/amarok/amarok-1.4.1-fix-initial-preference.patch b/mandriva/2010.2/applications/amarok/amarok-1.4.1-fix-initial-preference.patch
deleted file mode 100644
index 2b41e1ba3..000000000
--- a/mandriva/2010.2/applications/amarok/amarok-1.4.1-fix-initial-preference.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur amarok-1.4.10/amarok/src/amarok.desktop amarok-1.4.10_yeni/amarok/src/amarok.desktop
---- amarok-1.4.10/amarok/src/amarok.desktop 2008-08-14 00:21:51.000000000 +0300
-+++ amarok-1.4.10_yeni/amarok/src/amarok.desktop 2009-12-20 01:01:49.987559971 +0200
-@@ -2,6 +2,7 @@
- Type=Application
- Version=0.9.4
- Encoding=UTF-8
-+InitialPreference=15
- Name=Amarok
- Name[bn]=আমারক
- Name[el]=AmaroK
diff --git a/mandriva/2010.2/applications/amarok/amarok-add-radios.patch b/mandriva/2010.2/applications/amarok/amarok-add-radios.patch
deleted file mode 100644
index cb4b0fc39..000000000
--- a/mandriva/2010.2/applications/amarok/amarok-add-radios.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur amarok-1.4.10/amarok/src/data/Cool-Streams.xml amarok-1.4.10_yeni/amarok/src/data/Cool-Streams.xml
---- amarok-1.4.10/amarok/src/data/Cool-Streams.xml 2008-08-14 00:21:51.000000000 +0300
-+++ amarok-1.4.10_yeni/amarok/src/data/Cool-Streams.xml 2009-12-20 01:24:34.072559305 +0200
-@@ -9,6 +9,9 @@
- <stream name="Digital Gunfire [Industrial/EBM]">
- <url>http://www.digitalgunfire.com/playlist.pls</url>
- </stream>
-+ <stream name="Club 977 80's channel">
-+ <url>http://www.club977.com/CLUB977HI.pls</url>
-+ </stream>
- <stream name="Digitally Imported - Chillout [Chill-Out]">
- <url>http://di.fm/mp3/chillout.pls</url>
- </stream>
-@@ -18,6 +21,9 @@
- <stream name="Digitally Imported - Trance [Trance]">
- <url>http://di.fm/mp3/trance.pls</url>
- </stream>
-+ <stream name="Dogmazic [Free Music/Musique Libre]">
-+ <url>http://radio.dogmazic.net:8000/radio_mlo.ogg.m3u</url>
-+ </stream>
- <stream name="DnbRadio [Drum and Bass]">
- <url>http://dnbradio.com/hi.pls</url>
- </stream>
-@@ -69,6 +75,18 @@
- <stream name="Secret Agent [Downtempo/Lounge]">
- <url>http://somafm.com/secretagent.pls</url>
- </stream>
-+ <stream name="SkyFM [TopHits]">
-+ <url>http://www.sky.fm/mp3/tophits.pls</url>
-+ </stream>
-+ <stream name="SkyFM [80s]">
-+ <url>http://www.sky.fm/mp3/the80s.pls</url>
-+ </stream>
-+ <stream name="SkyFM [Classical music]">
-+ <url>http://www.sky.fm/mp3/classical.pls</url>
-+ </stream>
-+ <stream name="SkyFM [NewAge]">
-+ <url>http://www.sky.fm/mp3/newage.pls</url>
-+ </stream>
- <stream name="SLAY Radio [C64 Remixes]">
- <url>http://sc.slayradio.org:8000/listen.pls</url>
- </stream>
diff --git a/mandriva/2010.2/applications/amarok/fix-ifpdevice-build.patch b/mandriva/2010.2/applications/amarok/fix-ifpdevice-build.patch
deleted file mode 100644
index 615163e1a..000000000
--- a/mandriva/2010.2/applications/amarok/fix-ifpdevice-build.patch
+++ /dev/null
@@ -1,1163 +0,0 @@
-diff -Naur amarok-1.4.10/amarok/configure.in.in amarok-1.4.10-yeni/amarok/configure.in.in
---- amarok-1.4.10/amarok/configure.in.in 2008-08-14 00:21:51.000000000 +0300
-+++ amarok-1.4.10-yeni/amarok/configure.in.in 2010-02-13 04:08:24.239228672 +0200
-@@ -830,8 +830,14 @@
-
- if test "$build_ifp" != "no"; then
-
-- AC_CHECK_HEADERS([ifp.h], [have_ifp=yes], [], [])
-+ AC_LANG_PUSH([C++])
-+ AC_CHECK_HEADERS([ifp.h], [have_ifp=yes], [], [],
-+ [[#ifdef HAVE_STDIO_H
-+ # include <stdio.h>
-+ #endif
-+ ]])
- AC_CHECK_HEADERS([usb.h], [have_usb=yes], [], [])
-+ AC_LANG_POP
-
- if test "$have_ifp" = "yes"; then
- AC_DEFINE(HAVE_IFP, 1, [have ifp])
-diff -Naur amarok-1.4.10/amarok/configure.in.in~ amarok-1.4.10-yeni/amarok/configure.in.in~
---- amarok-1.4.10/amarok/configure.in.in~ 1970-01-01 02:00:00.000000000 +0200
-+++ amarok-1.4.10-yeni/amarok/configure.in.in~ 2010-02-13 04:08:24.238476218 +0200
-@@ -0,0 +1,1140 @@
-+
-+###############################################################################
-+# BEGIN PKG-CONFIG CHECK
-+###############################################################################
-+
-+AC_ARG_VAR(PKGCONFIGFOUND, [Path to pkg-config])
-+AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes])
-+
-+###############################################################################
-+# END PKG-CONFIG CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN TAGLIB CHECK
-+###############################################################################
-+
-+PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.5], [taglib_15_found=yes], [PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.4])])
-+
-+AM_CONDITIONAL([TAGLIB_15_FOUND], [test "x$taglib_15_found" = "xyes"])
-+AC_SUBST(TAGLIB_CFLAGS)
-+AC_SUBST(TAGLIB_LIBS)
-+
-+if test "x$taglib_15_found" = "xyes"; then
-+ AC_DEFINE([TAGLIB_15], 1, [Taglib 1.5 or later found, disabling duplicate metadata plugins])
-+fi
-+
-+###############################################################################
-+# END TAGLIB CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN GSTREAMER-0.10 CHECK
-+###############################################################################
-+
-+#AC_ARG_WITH(gstreamer10,
-+# AC_HELP_STRING([--with-gstreamer10],[build Amarok with GStreamer 0.10-engine]),
-+# [build_gstreamer10=$withval],
-+# [build_gstreamer10=no]
-+#)
-+#
-+#if test "$build_gstreamer10" != "no"; then
-+# if test "$PKGCONFIGFOUND" = "yes" ; then
-+# # check for GStreamer
-+# dnl Now we're ready to ask for gstreamer libs and cflags
-+# dnl And we can also ask for the right version of gstreamer
-+# have_gst10=no
-+#
-+# GST10_MAJORMINOR=0.10
-+# GST10_REQ=0.10.0
-+#
-+# PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR,
-+# have_gst10=yes,have_gst10=no)
-+#
-+# dnl Give error if we don't have gstreamer
-+# if test "x$have_gst10" = "xno"; then
-+# LIB_GST10=""
-+# CFLAGS_GST10=""
-+# else
-+# LIB_GST10=$GST10_LIBS
-+# CFLAGS_GST10=$GST10_CFLAGS
-+# AC_SUBST(LIB_GST10)
-+# AC_SUBST(CFLAGS_GST10)
-+# AC_SUBST(GST10_MAJORMINOR)
-+# AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10])
-+# fi
-+# fi
-+#fi
-+#
-+#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes])
-+
-+###############################################################################
-+# END GSTREAMER-0.10 CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN XINE CHECK
-+###############################################################################
-+
-+AC_ARG_WITH(xine,
-+ AC_HELP_STRING([--without-xine],[build Amarok without xine-engine]),
-+ [build_xine=$withval],
-+ [build_xine=yes]
-+)
-+
-+if test "$build_xine" != "no"; then
-+ PKG_CHECK_MODULES([XINE], [libxine >= 1.0.2], , [build_xine=no])
-+fi
-+
-+AM_CONDITIONAL(with_xine, test x$build_xine = xyes)
-+AC_SUBST(XINE_CFLAGS)
-+AC_SUBST(XINE_LIBS)
-+
-+###############################################################################
-+# END XINE CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN AKODE CHECK
-+###############################################################################
-+
-+#AC_ARG_WITH(akode,
-+# AC_HELP_STRING([--without-akode],[build Amarok without akode-engine]),
-+# [build_akode=$withval],
-+# [build_akode=yes]
-+#)
-+#
-+#if test "$build_akode" != "no"; then
-+#
-+# AC_CHECK_PROG(AKODE_CONFIG, akode-config, yes)
-+#
-+# if test x$AKODE_CONFIG = xyes ; then
-+# AC_DEFINE(HAVE_AKODE, 1, [have aKode])
-+# CFLAGS_AKODE=[`akode-config --cflags`]
-+# LIBS_AKODE=[`akode-config --libs`]
-+#
-+# akode_version=`akode-config --version`
-+# akode_version=VERSION_TO_NUMBER(echo $akode_version)
-+# akode_version_min="2.0.0"
-+# akode_version_min=VERSION_TO_NUMBER(echo $akode_version_min)
-+#
-+# AC_MSG_CHECKING([for akode-lib version >= 2.0])
-+#
-+# if test $akode_version -eq $akode_version_min \
-+# -o $akode_version -gt $akode_version_min; then
-+#
-+# echo "yes"
-+#
-+# else
-+# echo "no"
-+#
-+# build_akode=no
-+# fi
-+# else
-+# build_akode=no
-+# fi
-+#fi
-+#
-+#AM_CONDITIONAL(with_akode, test x$build_akode = xyes)
-+#AC_SUBST(CFLAGS_AKODE)
-+#AC_SUBST(LIBS_AKODE)
-+
-+###############################################################################
-+# END AKODE CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN NMM CHECK
-+###############################################################################
-+
-+AC_ARG_WITH(nmm,
-+ AC_HELP_STRING([--with-nmm],[build Amarok with NMM-engine]),
-+ [build_nmm=$withval],
-+ [build_nmm=no]
-+)
-+
-+AC_ARG_WITH(nmm-dir,
-+ AC_HELP_STRING([--with-nmm-dir],[path to the NMM [default=/usr/local]]),
-+ [nmm_dir="$withval"],
-+ [nmm_dir=/usr/local]
-+)
-+
-+if test "$build_nmm" != "no"; then
-+
-+ CFLAGS_NMM="-I$nmm_dir/include"
-+ LDFLAGS_NMM="-L$nmm_dir/lib"
-+ AC_DEFINE(HAVE_NMM, 1, [have NMM])
-+fi
-+
-+AM_CONDITIONAL(with_nmm, test x$build_nmm = xyes)
-+AC_SUBST(CFLAGS_NMM)
-+AC_SUBST(LDFLAGS_NMM)
-+
-+###############################################################################
-+# END NMM CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN MAS CHECK
-+###############################################################################
-+
-+#AC_ARG_WITH(mas,
-+# AC_HELP_STRING([--with-mas],[build Amarok with MAS-engine]),
-+# [build_mas=$withval],
-+# [build_mas=no]
-+#)
-+#
-+#
-+#if test "$build_mas" != "no"; then
-+#
-+# AC_PATH_PROG(MAS_CONFIG, mas-config, no)
-+#
-+# if test $MAS_CONFIG = "no"
-+# then
-+# amarok_warning_mas_notfound=yes
-+# echo "amarok_warning_mas_notfound: $amarok_warning_mas_notfound"
-+# build_mas=no
-+# else
-+# AC_DEFINE(HAVE_MAS, 1, [have MAS])
-+#
-+# CFLAGS_MAS=[`$MAS_CONFIG --cflags`]
-+# LIBS_MAS=[`$MAS_CONFIG --libs`]
-+#
-+# build_mas=yes
-+# fi
-+#fi
-+#
-+#AM_CONDITIONAL(with_mas, test x$build_mas = xyes)
-+#AC_SUBST(CFLAGS_MAS)
-+#AC_SUBST(LIBS_MAS)
-+
-+###############################################################################
-+# END MAS CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN HELIX CHECK
-+###############################################################################
-+
-+AC_ARG_WITH(helix,
-+ AC_HELP_STRING([--with-helix],[build Amarok with Helix-engine]),
-+ [build_helix=$withval],
-+ [build_helix=no]
-+)
-+
-+if test "$build_helix" != "no"; then
-+ AC_MSG_CHECKING([for RealPlayer or HelixPlayer])
-+
-+ if test "$build_helix" = "yes"; then
-+ HXPLAY=`type -p hxplay`
-+ RPLAY=`type -p realplay`
-+ if test "$RPLAY" != "" -a -x "$RPLAY"; then
-+ HELIX_LINK=`readlink -f $RPLAY`
-+ HELIX_LINK=`dirname $HELIX_LINK`
-+ HELIX_LIBS=`unset CDPATH; cd $HELIX_LINK && pwd`
-+ if test -e "$HELIX_LIBS/common/clntcore.so"; then
-+ AC_MSG_RESULT([found RealPlayer in $HELIX_LIBS])
-+ build_helix=$HELIX_LIBS
-+ fi
-+ elif test "$HXPLAY" != "" -a -x "$HXPLAY"; then
-+ HELIX_LINK=`readlink -f $HXPLAY`
-+ HELIX_LINK=`dirname $HELIX_LINK`
-+ HELIX_LIBS=`unset CDPATH; cd $HELIX_LINK && pwd`
-+ if test -e "$HELIX_LIBS/common/clntcore.so"; then
-+ AC_MSG_RESULT([found HelixPlayer in $HELIX_LIBS])
-+ build_helix=$HELIX_LIBS
-+ fi
-+ fi
-+ else
-+ if test -n "$build_helix" -a -d "$build_helix"; then
-+ HELIX_LIBS=`unset CDPATH; cd $build_helix && pwd`
-+ else
-+ HELIX_LIBS="$build_helix"
-+ fi
-+ build_helix=$HELIX_LIBS
-+ AC_MSG_RESULT([using $HELIX_LIBS])
-+ fi
-+
-+ AC_DEFINE(HAVE_HELIX, 1, [have HELIX])
-+ if test "$build_helix" = "yes"; then
-+ HELIX_LIBS="/usr/local/RealPlayer"
-+ AC_MSG_RESULT(["not found, using default dir"])
-+ fi
-+ AC_DEFINE_UNQUOTED(HELIX_LIBS, "${HELIX_LIBS}", [location of helix libs])
-+ if test "$PKGCONFIGFOUND" = "yes" ; then
-+ PKG_CHECK_MODULES([ALSALIB], alsa, have_alsa=yes,have_alsa=no)
-+ if test "$have_alsa" = "yes" ; then
-+ AC_DEFINE(USE_HELIX_ALSA, 1, [support ALSA in the helix-engine])
-+ fi
-+ fi
-+fi
-+
-+AM_CONDITIONAL(with_helix, test x$build_helix != xno)
-+
-+###############################################################################
-+# END HELIX CHECK
-+###############################################################################
-+
-+###############################################################################
-+# BEGIN yauap CHECK
-+###############################################################################
-+
-+AC_ARG_WITH(yauap,
-+ AC_HELP_STRING([--with-yauap],[build Amarok with yauap-engine]),
-+ [build_yauap=$withval],
-+ [build_yauap=no]
-+)
-+
-+if test "$build_yauap" != "no"; then
-+ if test "$PKGCONFIGFOUND" = "yes" ; then
-+ # check for dbus-glib
-+ have_yauap=no
-+
-+ PKG_CHECK_MODULES(DBUS, dbus-1,
-+ have_yauap=yes,have_yauap=no)
-+
-+
-+ dnl Give error if we don't have gstreamer
-+ if test "x$have_yauap" = "xno"; then
-+ LIB_YAUAP=""
-+ CFLAGS_YAUAP=""
-+ else
-+ LIB_YAUAP="$DBUS_LIBS -ldbus-qt-1"
-+ CFLAGS_YAUAP="$DBUS_CFLAGS"
-+ AC_SUBST(LIB_YAUAP)
-+ AC_SUBST(CFLAGS_YAUAP)
-+ AC_DEFINE(HAVE_YAUAP, 1, [have yauap])
-+ fi
-+ fi
-+fi
-+
-+AM_CONDITIONAL(with_yauap, [test x$have_yauap = xyes])
-+
-+###############################################################################
-+# END yauap CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN stdint.h CHECK
-+###############################################################################
-+
-+AC_CHECK_HEADER(stdint.h)
-+
-+###############################################################################
-+# END stdint.h CHECK
-+###############################################################################
-+
-+
-+###############################################################################
-+# BEGIN fabsf CHECK
-+###############################################################################
-+
-+AC_CHECK_DECLS([fabsf],,,[#include <math.h>])
-+if test "$ac_cv_have_decl_fabsf" = "yes"; then
-+ AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [[#include <math.h>]],
-+ [[return (int)fabsf(1.f);]])],
-+ [AC_DEFINE(HAVE_FABSF, 1, [have fabsf])])
-+fi
-+
-+###############################################################################
-+# END fabsf CHECK
-+###############################################################################
-+
-+
-+
-+
-+
-+###############################################################################
-+# BEGIN INOTIFY CHECK
-+###############################################################################
-+
-+AC_CHECK_HEADERS(linux/inotify.h)
-+
-+if test x"$ac_cv_header_linux_inotify_h" = x"yes"; then
-+ AC_DEFINE(HAVE_INOTIFY, 1, [have inotify])
-+fi
-+
-+###############################################################################
-+# END INOTIFY CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN QT OPENGL CHECK
-+###############################################################################
-+
-+AC_ARG_WITH(opengl,
-+ AC_HELP_STRING([--without-opengl],[build Amarok without OpenGL support]),
-+ [build_opengl=$withval],
-+ [build_opengl=yes]
-+)
-+
-+if test "$build_opengl" != "no"; then
-+ AC_MSG_CHECKING(for Qt with OpenGL support)
-+ AC_CACHE_VAL(ac_cv_kde_qt_has_opengl,
-+ [
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+
-+ save_CXXFLAGS="$CXXFLAGS"
-+ save_LIBS="$LIBS"
-+ save_LDFLAGS="$LDFLAGS"
-+
-+ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-+ LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-+ LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-+
-+ AC_TRY_LINK([
-+ #include <qgl.h>
-+ ],
-+ [
-+ (void)new QGLWidget((QWidget*)0, "qgl");
-+ ],
-+ ac_cv_kde_qt_has_opengl=yes,
-+ ac_cv_kde_qt_has_opengl=no)
-+
-+ CXXFLAGS="$save_CXXFLAGS"
-+ LIBS="$save_LIBS"
-+ LDFLAGS="$save_LDFLAGS"
-+ AC_LANG_RESTORE
-+ ])
-+ AC_MSG_RESULT($ac_cv_kde_qt_has_opengl)
-+
-+ if test x$ac_cv_kde_qt_has_opengl = xyes; then
-+ AC_DEFINE(HAVE_QGLWIDGET, 1, [have Qt with OpenGL support])
-+ gl_libs="-lGL"
-+ else
-+ gl_libs=""
-+ fi
-+
-+ AC_SUBST(gl_libs)
-+fi
-+
-+###############################################################################
-+# END QT OPENGL CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN SQLITE CHECK
-+###############################################################################
-+
-+LIB_SQLITE=""
-+
-+AC_ARG_WITH(included-sqlite,
-+ AC_HELP_STRING([--without-included-sqlite],[build Amarok using system sqlite library]),
-+ [included_sqlite=$withval],
-+ [included_sqlite=yes]
-+)
-+
-+if test x$included_sqlite = xno; then
-+ if test x$PKGCONFIGFOUND = xyes; then
-+ PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.0, have_sqlite=yes,have_sqlite=no)
-+
-+ if test x$have_sqlite = xyes; then
-+ ## AC_DEFINE(HAVE_SQLITE, 1, [have SQLite database library])
-+ LIB_SQLITE=`pkg-config --libs sqlite3`
-+ else
-+ # We don't support not having sqlite anymore
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
-+ no_amarok=yes
-+ fi
-+ fi
-+fi
-+
-+AC_SUBST(LIB_SQLITE)
-+AM_CONDITIONAL(with_included_sqlite, [test x$included_sqlite = xyes])
-+
-+
-+# Determine pointer size for sqlite
-+
-+KDE_CHECK_TYPES
-+AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Determine pointer size for SQLite])
-+
-+###############################################################################
-+# END SQLITE CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN MYSQL CHECK
-+###############################################################################
-+
-+AC_ARG_ENABLE(mysql,
-+ AC_HELP_STRING([--enable-mysql],[build Amarok with MySQL support]),
-+ [enable_mysql=$enableval],
-+ [enable_mysql=no]
-+)
-+
-+if test "$enable_mysql" = "yes"; then
-+
-+ AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, yes)
-+
-+ if test x$MYSQL_CONFIG = xyes; then
-+ AC_DEFINE(USE_MYSQL, 1, [MySql database support enabled])
-+
-+ mysql_includes=`mysql_config --cflags`
-+ mysql_libs=`mysql_config --libs`
-+ else
-+ amarok_warning_mysql_notfound=yes
-+ enable_mysql=no
-+ fi
-+
-+fi
-+
-+AM_CONDITIONAL(enable_mysql, test x$enable_mysql = xyes)
-+AC_SUBST(mysql_includes)
-+AC_SUBST(mysql_libs)
-+
-+###############################################################################
-+# END MYSQL CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN POSTGRESQL CHECK
-+###############################################################################
-+
-+AC_ARG_ENABLE(postgresql,
-+ AC_HELP_STRING([--enable-postgresql],[build Amarok with PostgreSQL support]),
-+ [enable_postgresql=$enableval],
-+ [enable_postgresql=no]
-+)
-+
-+if test "$enable_postgresql" = "yes"; then
-+
-+ AC_CHECK_PROG(POSTGRESQL_CONFIG, pg_config, yes)
-+
-+ if test x$POSTGRESQL_CONFIG = xyes; then
-+ AC_DEFINE(USE_POSTGRESQL, 1, [Postgresql database support enabled])
-+
-+ postgresql_includes=-I`pg_config --includedir`
-+ postgresql_libs="-L`pg_config --libdir` -lpq"
-+ else
-+ amarok_warning_postgresql_notfound=yes
-+ enable_postgresql=no
-+ fi
-+
-+fi
-+
-+AM_CONDITIONAL(enable_postgresql, test x$enable_postgresql = xyes)
-+AC_SUBST(postgresql_includes)
-+AC_SUBST(postgresql_libs)
-+
-+###############################################################################
-+# END POSTGRESQL CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN LIBVISUAL CHECK
-+###############################################################################
-+
-+AC_ARG_WITH(libvisual,
-+ AC_HELP_STRING([--without-libvisual],[build Amarok without libvisual support]),
-+ [with_libvisual=$withval],
-+ [with_libvisual=yes]
-+)
-+
-+if test "$with_libvisual" = "yes"; then
-+ ## libvisual plugin depends on sdl
-+ AC_CHECK_PROG(SDL_CONFIG, sdl-config, yes)
-+
-+ if test x$SDL_CONFIG = xyes; then
-+ sdl_cflags=`sdl-config --cflags`
-+ sdl_libs=`sdl-config --libs`
-+ fi
-+
-+ AC_SUBST(sdl_cflags)
-+ AC_SUBST(sdl_libs)
-+
-+ if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then
-+
-+ PKG_CHECK_MODULES(LIBVISUAL, libvisual-0.4 >= 0.4.0, [build_libvisual="yes"], [build_libvisual="no"])
-+
-+ AC_SUBST(LIBVISUAL_LIBS)
-+ AC_SUBST(LIBVISUAL_CFLAGS)
-+
-+ if test x$build_libvisual = xyes; then
-+ AC_DEFINE(HAVE_LIBVISUAL, 1, [have LIBVISUAL])
-+ fi
-+ fi
-+fi
-+
-+AM_CONDITIONAL(with_libvisual, test x$build_libvisual = xyes)
-+
-+###############################################################################
-+# END LIBVISUAL CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN TUNEPIMP CHECK
-+###############################################################################
-+
-+AC_ARG_WITH(musicbrainz,
-+ AC_HELP_STRING([--without-musicbrainz],[build Amarok without MusicBrainz support]),
-+ [with_musicbrainz=$withval],
-+ [with_musicbrainz=yes]
-+)
-+
-+if test "$with_musicbrainz" = "yes"; then
-+ AC_CHECK_HEADER(tunepimp-0.5/tp_c.h, [build_musicbrainz="yes"],
-+ [AC_CHECK_HEADER(tunepimp/tp_c.h, [build_musicbrainz="yes"],
-+ [build_musicbrainz="no"])])
-+fi
-+
-+if test "$build_musicbrainz" = "yes"; then
-+ AC_CHECK_LIB(tunepimp, tr_GetPUID,
-+ AC_DEFINE(HAVE_TUNEPIMP, 5, [have MusicBrainz 0.5.x]),
-+ AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding,
-+ AC_DEFINE(HAVE_TUNEPIMP, 4, [have MusicBrainz 0.4.x]),
-+ AC_DEFINE(HAVE_TUNEPIMP, 1, [have MusicBrainz])))
-+ LIB_TUNEPIMP="-ltunepimp"
-+ have_tunepimp=yes
-+else
-+ AC_DEFINE(HAVE_TUNEPIMP, 0, [have TunePimp])
-+ LIB_TUNEPIMP=""
-+ have_tunepimp=no
-+fi
-+
-+AC_SUBST(LIB_TUNEPIMP)
-+
-+###############################################################################
-+# END TUNEPIMP CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN AMAZON CHECK
-+###############################################################################
-+
-+AC_ARG_ENABLE(amazon,
-+ AC_HELP_STRING([--disable-amazon],[disable Amazon cover download support [default=enable]]),
-+ [enable_amazon=$enableval],
-+ [enable_amazon=yes]
-+)
-+
-+if test "$enable_amazon" != "no"; then
-+ AC_DEFINE(AMAZON_SUPPORT, 1, [Amazon cover download support enabled])
-+fi
-+
-+###############################################################################
-+# END AMAZON CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN SCHED_SETAFFINITY BUGGY GLIBC CHECK
-+###############################################################################
-+
-+AC_MSG_CHECKING([if sched_setaffinity should be enabled])
-+
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+
-+amarok_glibcsched_works=no
-+
-+AC_TRY_COMPILE([
-+ #include <sched.h>
-+],
-+[
-+ cpu_set_t mask;
-+ CPU_ZERO( &mask );
-+ CPU_SET( 0, &mask );
-+ sched_setaffinity( 0, sizeof(mask), &mask );
-+],
-+ amarok_sched_3params=yes,
-+ amarok_sched_3params=no
-+)
-+
-+if test "x$amarok_sched_3params" = "xyes"; then
-+ AC_DEFINE(SCHEDAFFINITY_SUPPORT, 1, [sched_setaffinity works correctly])
-+ AC_DEFINE(SCHEDAFFINITY_3PARAMS, 1, [sched_setaffinity takes three params])
-+ amarok_glibcsched_works=yes
-+fi
-+
-+if test "x$amarok_sched_3params" = "xno"; then
-+ AC_TRY_COMPILE([
-+ #include <sched.h>
-+ ],
-+ [
-+ cpu_set_t mask;
-+ CPU_ZERO( &mask );
-+ CPU_SET( 0, &mask );
-+ sched_setaffinity( 0, &mask );
-+ ],
-+ amarok_sched_2params=yes,
-+ amarok_sched_2params=no
-+ )
-+ if test "x$amarok_sched_2params" = "xyes"; then
-+ AC_DEFINE(SCHEDAFFINITY_SUPPORT, 1, [sched_setaffinity works correctly])
-+ amarok_glibcsched_works=yes
-+ fi
-+fi
-+
-+AC_LANG_RESTORE
-+
-+AC_MSG_RESULT($amarok_glibcsched_works)
-+
-+###############################################################################
-+# END SCHED_SETAFFINITY BUGGY GLIBC CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN KDEBASE CHECK
-+###############################################################################
-+
-+KDE_CHECK_HEADER(konqsidebarplugin.h, have_konqsidebar=yes, have_konqsidebar=no)
-+KDE_CHECK_LIB(konqsidebarplugin, _init, have_konqsidebar=$have_konqsidebar, have_konqsidebar=no)
-+
-+AM_CONDITIONAL(with_konqsidebar, [test x$have_konqsidebar = xyes])
-+
-+###############################################################################
-+# END KDEBASE CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN NJB CHECK
-+###############################################################################
-+### mediabrowser.cpp can use libnjb if available
-+
-+AC_ARG_WITH(libnjb,
-+ AC_HELP_STRING([--with-libnjb],[build Amarok with Nomad Jukebox support from libnjb]),
-+ [build_libnjb=$withval],
-+ [build_libnjb=yes]
-+)
-+
-+if test "$build_libnjb" != "no"; then
-+ if test "$PKGCONFIGFOUND" = "yes" ; then
-+
-+ # check for libnjb
-+ have_libnjb=no
-+
-+ PKG_CHECK_MODULES(LIBNJB, libnjb, have_libnjb=yes,have_libnjb=no)
-+ if test "x$have_libnjb" != "xno"; then
-+ AC_DEFINE(HAVE_LIBNJB, 1, [have libnjb])
-+ fi
-+ fi
-+fi
-+
-+AM_CONDITIONAL(with_libnjb, [test x$have_libnjb = xyes])
-+
-+###############################################################################
-+# END NJB CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN MTP CHECK
-+###############################################################################
-+### mediabrowser.cpp can use libmtp if available
-+
-+AC_ARG_WITH(libmtp,
-+ AC_HELP_STRING([--with-libmtp],[build Amarok with support for MTP devices]),
-+ [build_libmtp=$withval],
-+ [build_libmtp=yes]
-+)
-+if test "$build_libmtp" != "no"; then
-+ if test "$PKGCONFIGFOUND" = "yes" ; then
-+ PKG_CHECK_MODULES(LIBMTP, libmtp >= 0.1.1,
-+ [
-+ have_libmtp=yes
-+ ],
-+ [
-+ have_libmtp=no
-+ ])
-+ fi
-+
-+ if test "x$have_libmtp" != "xno"; then
-+ AC_DEFINE(HAVE_LIBMTP, 1, [have libmtp])
-+ fi
-+fi
-+
-+AM_CONDITIONAL(with_libmtp, [test x$have_libmtp = xyes])
-+
-+###############################################################################
-+# END MTP CHECK
-+###############################################################################
-+
-+###############################################################################
-+# BEGIN RIO KARMA CHECK
-+###############################################################################
-+### mediabrowser.cpp can use libkarma if available
-+
-+AC_ARG_WITH(libkarma,
-+ AC_HELP_STRING([--with-libkarma],[build Amarok with Rio Karma support]),
-+ [build_libkarma=$withval],
-+ [build_libkarma=yes]
-+)
-+
-+if test "$build_libkarma" != "no"; then
-+ AC_CHECK_HEADERS([libkarma/lkarma.h], [have_libkarma=yes], [], [])
-+ AC_CHECK_HEADERS([usb.h], [have_usb=yes], [], [])
-+
-+ if test "$have_libkarma" = "yes"; then
-+ AC_DEFINE(HAVE_LIBKARMA, 1, [have libkarma])
-+ else
-+ AC_MSG_RESULT($have_libkarma)
-+ have_libkarma=no
-+ fi
-+fi
-+
-+AM_CONDITIONAL(with_libkarma, [test x$have_libkarma = xyes])
-+
-+###############################################################################
-+# END RIO KARMA CHECK
-+###############################################################################
-+
-+###############################################################################
-+# BEGIN IFP CHECK
-+###############################################################################
-+### mediabrowser.cpp can use libifp if available
-+
-+AC_ARG_WITH(ifp,
-+ AC_HELP_STRING([--with-ifp],[build Amarok with ifp support]),
-+ [build_ifp=$withval],
-+ [build_ifp=yes]
-+)
-+
-+if test "$build_ifp" != "no"; then
-+
-+ AC_LANG_PUSH([C])
-+ AC_CHECK_HEADERS([ifp.h], [have_ifp=yes], [], [],
-+ [[#ifdef HAVE_USB_H
-+ # include <USB.h>
-+ #endif
-+ ]])
-+ AC_CHECK_HEADERS([usb.h], [have_usb=yes], [], [])
-+ AC_LANG_POP
-+
-+ if test "$have_ifp" = "yes"; then
-+ AC_DEFINE(HAVE_IFP, 1, [have ifp])
-+ IFP_LIBS="-lifp -lusb"
-+ else
-+ AC_MSG_RESULT($have_ifp)
-+ have_ifp=no
-+ fi
-+
-+fi
-+
-+AC_SUBST(IFP_INCLUDES)
-+AC_SUBST(IFP_LIBS)
-+
-+AM_CONDITIONAL(with_ifp, [test x$have_ifp = xyes])
-+
-+###############################################################################
-+# END IFP CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN LIBGPOD CHECK
-+###############################################################################
-+
-+AC_ARG_WITH(libgpod,
-+ AC_HELP_STRING([--with-libgpod],[build Amarok with iPod support from libgpod]),
-+ [build_libgpod=$withval],
-+ [build_libgpod=yes]
-+)
-+
-+if test "$build_libgpod" != "no"; then
-+ if test "$PKGCONFIGFOUND" = "yes" ; then
-+
-+ # check for libgpod
-+ have_libgpod=no
-+
-+ PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0, have_libgpod=yes,have_libgpod=no)
-+
-+ if test "x$have_libgpod" = "xyes"; then
-+ ac_cppflags_save=$CPPFLAGS
-+ ac_cflags_save=$CFLAGS
-+ ac_libs_save=$LIBS
-+ CPPFLAGS="$CPPFLAGS $LIBGPOD_INCLUDES"
-+ CFLAGS="$CFLAGS $LIBGPOD_CFLAGS"
-+ LIBS="$LIBS $LIBGPOD_LIBS"
-+
-+ AC_CHECK_FUNCS(itdb_track_set_thumbnails, , have_libgpod_042=no)
-+ AC_CHECK_FUNCS(itdb_get_mountpoint, , have_libgpod_042=no)
-+ AC_CHECK_FUNCS(itdb_device_get_ipod_info, , have_libgpod_042=no)
-+
-+ AC_CHECK_MEMBER(struct _Itdb_Track.movie_flag,
-+ [AC_DEFINE(HAVE_ITDB_MOVIE_FLAG, 1, [have libgpod movie flag])],
-+ have_libgpod_042=no,
-+ [#include <gpod/itdb.h>])
-+
-+ AC_CHECK_MEMBER(struct _Itdb_Track.skip_when_shuffling,
-+ [AC_DEFINE(HAVE_ITDB_SKIP_SHUFFLE_FLAG, 1, [have libgpod skip when shuffling flag])],
-+ have_libgpod_042=no,
-+ [#include <gpod/itdb.h>])
-+
-+ AC_CHECK_MEMBER(struct _Itdb_Track.mark_unplayed,
-+ [AC_DEFINE(HAVE_ITDB_MARK_UNPLAYED, 1, [have libgpod mark played flag])],
-+ have_libgpod_042=no,
-+ [#include <gpod/itdb.h>])
-+
-+ AC_CHECK_MEMBER(struct _Itdb_Track.mediatype,
-+ [AC_DEFINE(HAVE_ITDB_MEDIATYPE, 1, [have libgpod mediatype flag])],
-+ have_libgpod_042=no,
-+ [#include <gpod/itdb.h>])
-+
-+ AC_CHECK_DECL(ITDB_IPOD_MODEL_TOUCH_BLACK,
-+ [AC_DEFINE(HAVE_LIBGPOD_060, 1, [have at least libgpod 0.6.0])],
-+ have_libgpod_060=no,
-+ [#include <gpod/itdb.h>])
-+
-+ CPPFLAGS=$ac_cppflags_save
-+ CFLAGS=$ac_cflags_save
-+ LIBS=$ac_libs_save
-+ fi
-+
-+ if test "x$have_libgpod_042" = "xno"; then
-+ have_libgpod=no
-+ AC_MSG_RESULT(Your libgpod version is too old: at least 0.4.2 is required)
-+ fi
-+
-+ if test "x$have_libgpod" != "xno"; then
-+ AC_DEFINE(HAVE_LIBGPOD, 1, [have libgpod])
-+ fi
-+ fi
-+fi
-+
-+AM_CONDITIONAL(with_libgpod, [test x$have_libgpod = xyes])
-+
-+###############################################################################
-+# END LIBGPOD CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN statvfs(2) CHECK
-+###############################################################################
-+
-+AC_CHECK_FUNCS(statvfs)
-+
-+###############################################################################
-+# END statvfs(2) CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN MP4V2 CHECK
-+###############################################################################
-+# m4a/aac tag reading and writing needs libmp4v2 from faad2 or better mpeg4ip
-+
-+AC_ARG_WITH(mp4v2,
-+ AC_HELP_STRING([--with-mp4v2],[build Amarok with M4A/AAC tag support from mp4v2/faad2]),
-+ [have_mp4v2=$withval],
-+ [have_mp4v2=no]
-+)
-+
-+AC_ARG_WITH(mp4v2-dir,
-+ AC_HELP_STRING([--with-mp4v2-dir],[path to mp4v2 [default=/usr]]),
-+ [mp4v2_dir="$withval"],
-+ [mp4v2_dir=/usr]
-+)
-+
-+if test "$have_mp4v2" != "no"; then
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ ac_cxxflags_save=$CXXFLAGS
-+ CXXFLAGS="$CXXFLAGS -I$mp4v2_dir/include"
-+ ac_ldflags_save=$LDFLAGS
-+ LDFLAGS="$LDFLAGS -L$mp4v2_dir/lib"
-+
-+ # not even everyone using faad2 has <systems.h>
-+ if ! test -f config.h; then
-+ echo "#include \"confdefs.h\"" > config.h
-+ fi
-+ ac_cppflags_save=$CPPFLAGS
-+ CPPFLAGS="$CPPFLAGS -I."
-+ AC_CHECK_HEADERS(systems.h)
-+ AC_CHECK_HEADERS([mp4.h], [have_mp4_h=yes], [],
-+ [#ifdef HAVE_SYSTEMS_H
-+ # include <systems.h>
-+ #endif
-+ ])
-+
-+ AC_CHECK_LIB( mp4v2, MP4Read, have_mp4v2=yes, have_mp4v2=no )
-+
-+ if test "$have_mp4v2" = "yes" -a "$have_mp4_h" = "yes"; then
-+ AC_DEFINE(HAVE_MP4V2, 1, [have mp4v2])
-+ MP4V2_INCLUDES="-I$mp4v2_dir/include"
-+ MP4V2_LIBS="-L$mp4v2_dir/lib -lmp4v2"
-+ else
-+ have_mp4v2=no
-+ fi
-+
-+ CPPFLAGS=$ac_cppflags_save
-+ CXXFLAGS=$ac_cxxflags_save
-+ LDFLAGS=$ac_ldflags_save
-+ AC_LANG_RESTORE
-+fi
-+
-+AC_SUBST(MP4V2_INCLUDES)
-+AC_SUBST(MP4V2_LIBS)
-+
-+AM_CONDITIONAL(with_mp4v2, [test x$have_mp4v2 != xno ])
-+
-+###############################################################################
-+# END MP4V2 CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN DAAP KDE 3.4 CHECK
-+###############################################################################
-+
-+daapsave_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes"
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+
-+AC_MSG_CHECKING([if KDE is at least 3.4 for DAAP support])
-+AC_COMPILE_IFELSE([
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 4, 0 ) )
-+#error KDE 3.4
-+#endif
-+],
-+ have_kde34="yes"
-+ DNSSD_LIBS=$LIB_KDNSSD
-+# echo "yes"
-+,
-+ have_kde34="no"
-+ DNSSD_LIBS=""
-+# echo "no"
-+)
-+CXXFLAGS="$daapsave_CXXFLAGS"
-+AC_LANG_RESTORE
-+AC_SUBST(DNSSD_LIBS)
-+AM_CONDITIONAL(atleast_kde34, [test x$have_kde34 != xno ])
-+AC_MSG_RESULT($have_kde34)
-+
-+###############################################################################
-+# END DAAP KDE 3.4 CHECK
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN OPTIONAL DAAP SUPPORT
-+###############################################################################
-+
-+AC_ARG_WITH(daap,
-+ AC_HELP_STRING([--without-daap],[build Amarok without support for DAAP]),
-+ [have_daap=$withval],
-+ [have_daap=yes]
-+)
-+
-+AM_CONDITIONAL(with_daap, [test x$have_daap = xyes])
-+
-+###############################################################################
-+# END OPTIONAL DAAP SUPPORT
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN DAAP TYPE CHECKS
-+###############################################################################
-+
-+AC_CHECK_TYPES([uint8_t, u_int8_t, uint16_t, u_int16_t, uint32_t, u_int32_t, uint64_t, u_int64_t])
-+
-+###############################################################################
-+# END DAAP TYPE CHECKS
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN DAAP MONGREL RUBY VARIABLE
-+###############################################################################
-+
-+AC_PATH_PROG(RUBY, ruby, no)
-+
-+ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]
-+ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`]
-+
-+AC_SUBST(ruby_includes)
-+AC_SUBST(ruby_ldflags)
-+OLDCFLAGS="$CFLAGS"
-+CFLAGS="-I$ruby_includes -Wall"
-+OLDCPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-I$ruby_includes" #no I don't know why CPPFLAGS is used
-+AC_CHECK_HEADERS([ruby.h], [have_ruby_h=yes], [have_ruby_h=no]) #used in ruby check below
-+CFLAGS="$OLDCFLAGS"
-+CPPFLAGS="$OLDCPPFLAGS"
-+
-+###############################################################################
-+# END DAAP MONGREL RUBY VARIABLE
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# BEGIN RUBY CHECK
-+###############################################################################
-+## TODO: Check version number >= 1.8
-+
-+if test "x$RUBY" = "xno" -o "x$have_ruby_h" = "xno"; then
-+ amarok_error_noruby=yes
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
-+ no_amarok=yes
-+fi
-+
-+###############################################################################
-+# END RUBY CHECK
-+###############################################################################
-+
-+
-+###############################################################################
-+# BEGIN DO_NOT_COMPILE CHECK
-+###############################################################################
-+
-+if test x$build_xine = xno -a x$build_helix = xno; then
-+
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
-+ no_engine=yes
-+
-+fi
-+
-+###############################################################################
-+# END DO_NOT_COMPILE CHECK
-+###############################################################################
-+
diff --git a/mandriva/2010.2/applications/amarok/kde3-amarok.spec b/mandriva/2010.2/applications/amarok/kde3-amarok.spec
deleted file mode 100644
index ed9566073..000000000
--- a/mandriva/2010.2/applications/amarok/kde3-amarok.spec
+++ /dev/null
@@ -1,638 +0,0 @@
-%define libname_orig libamarok
-%define libname %mklibname kde3amarok 0
-%define develname %mklibname -d kde3amarok 0
-%define develscripts %mklibname -d kde3amarok-scripts
-
-%define _disable_final 1
-
-#Add MySQL support
-%define build_mysql 1
-%{?_with_mysql: %global build_mysql 1}
-
-#Add PostgreSQL support
-%define build_postgresql 1
-%{?_with_postgresql: %global build_postgresql 1}
-
-Summary: A powerful media player for Kde
-Name: kde3-amarok
-Version: 3.5.12
-Release: %mkrel 1
-Epoch: 1
-License: GPLv2+
-Url: http://amarok.kde.org/
-Group: Sound
-Source0: amarok-%{version}.tar.bz2
-# fwang: add lyric script for Chinese songs
-# http://www.kde-apps.org/content/show.php/Lyrics_CN?content=50120
-Source1: Lyrics_CN-0.5.3.tar.bz2
-Patch0: amarok-1.4.1-fix-initial-preference.patch
-Patch1: amarok-1.3-fix-default-config.patch
-Patch2: amarok-1.2-fix-config.patch
-Patch3: amarok-1.4-beta2-add-multimedia-shortcut.patch
-#(nl): Disable for the moment as it had been reported that this patch is broken.
-Patch4: amarok-1.4.0-use-mandriva-directory.patch
-Patch6: amarok-add-radios.patch
-#Patch8: amarok-1.4.9.1-libmtp-0.3.0-build-fix.patch
-#Patch9: wikipedia-lookup.patch
-#Patch10: amarok-1.4.10-gcc44.patch
-Patch11: kde-3.5.10-acinclude.patch
-#Patch12: fix_autotools.patch
-Patch13: fix-ifpdevice-build.patch
-Patch14: kdebase-3.5.12-move-xdg-menu-dir.patch
-Patch15: kdebase-3.5.12-config.patch
-##########################################################
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: kde3-macros
-%if %mdkversion < 201000
-BuildRequires: autoconf <= 2.63
-%else
-BuildRequires: autoconf >= 2.65
-%endif
-BuildRequires: automake >= 1.9
-BuildRequires: taglib-devel >= 1.4
-BuildRequires: kdemultimedia-devel
-BuildRequires: libxine-devel
-BuildRequires: libvisual-devel >= 0.4.0
-BuildRequires: libtunepimp-devel >= 1:0.4.2
-BuildRequires: kdebase3-devel
-BuildRequires: libxml2-utils
-BuildRequires: kde3-k3b-devel
-BuildRequires: libifp-devel
-BuildRequires: SDL-devel
-BuildRequires: libgpod-devel <= 0.7.93
-BuildRequires: libnjb-devel
-BuildRequires: sqlite3-devel
-BuildRequires: libmtp-devel >= 0.3.0
-%if %build_mysql
-BuildRequires: mysql-devel
-%endif
-%if %build_postgresql
-BuildRequires: postgresql-devel
-%endif
-BuildRequires: mesaglut-devel
-BuildRequires: libgpod-devel
-BuildRequires: ruby-devel
-BuildRequires: gpm-devel
-BuildRequires: tcl-devel
-BuildRequires: libkarma-devel
-BuildRequires: musicbrainz-devel
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-Requires: kde3-amarok-engine
-Requires: kde3-amarok-scripts
-Requires: %{libname} = %epoch:%{version}
-Requires: tunepimp-plugins
-Suggests: moodbar
-Requires: libvisual-plugins >= 0.4.0
-Suggests: transkode
-Conflicts : amarok-engine-arts
-Conflicts : amarok-engine-gstreamer
-Conflicts : amarok-engine-akode
-Conflicts : amarok-engine-gstreamer0.10
-
-%description
-Feature Overview
-
-* Music Collection:
-You have a huge music library and want to locate tracks quickly? Let amaroK's
-powerful Collection take care of that! It's a database powered music store,
-which keeps track of your complete music library, allowing you to find any
-title in a matter of seconds.
-
-* Intuitive User Interface:
-You will be amazed to see how easy amaroK is to use! Simply drag-and-drop files
-into the playlist. No hassle with complicated buttons or tangled menus.
-Listening to music has never been easier!
-
-* Streaming Radio:
-Web streams take radio to the next level: Listen to thousands of great radio
-stations on the internet, for free! amaroK provides excellent streaming
-support, with advanced features, such as displaying titles of the currently
-playing songs.
-
-* Context Browser:
-This tool provides useful information on the music you are currently listening
-to, and can make listening suggestions, based on your personal music taste. An
-innovate and unique feature.
-
-* Visualizations:
-amaroK is compatible with XMMS visualization plugins. Allows you to use the
-great number of stunning visualizations available on the net. 3d visualizations
-with OpenGL are a great way to enhance your music experience.
-
-%if %mdkversion < 200900
-%post
-%update_menus
-%{update_desktop_database}
-%endif
-
-%if %mdkversion < 200900
-%postun
-%clean_menus
-%{clean_desktop_database}
-%endif
-
-%files
-%defattr(-,root,root)
-%doc README AUTHORS COPYING ChangeLog
-%{_kde3_bindir}/*
-%{_kde3_appsdir}/konqueror/servicemenus/amarok_*
-%{_kde3_datadir}/locale/*/*/*
-%{_kde3_docdir}/*/*/amarok
-%{_kde3_datadir}/applications/kde/amarok.desktop
-%{_kde3_datadir}/servicetypes/amarok_*
-%{_kde3_datadir}/services/amarok_daap-mediadevice.desktop
-%{_kde3_datadir}/services/amarok_generic-mediadevice.desktop
-%{_kde3_datadir}/services/amarok_ifp-mediadevice.desktop
-%{_kde3_datadir}/services/amarok_ipod-mediadevice.desktop
-%{_kde3_datadir}/services/amarok_massstorage-device.desktop
-%{_kde3_datadir}/services/amarok_mtp-mediadevice.desktop
-%{_kde3_datadir}/services/amarok_nfs-device.desktop
-%{_kde3_datadir}/services/amarok_njb-mediadevice.desktop
-%{_kde3_datadir}/services/amarok_smb-device.desktop
-%{_kde3_datadir}/services/amarok_riokarma-mediadevice.desktop
-%{_kde3_datadir}/services/amarokitpc.protocol
-%{_kde3_datadir}/services/amaroklastfm.protocol
-%{_kde3_datadir}/services/amarokpcast.protocol
-%dir %{_kde3_appsdir}/amarok
-%{_kde3_appsdir}/amarok/amarokui.rc
-%dir %{_kde3_appsdir}/amarok/data
-%{_kde3_appsdir}/amarok/ruby_lib
-%{_kde3_appsdir}/amarok/themes
-%{_kde3_appsdir}/amarok/data/*
-%{_kde3_appsdir}/amarok/icons/*/*/*/*
-%{_kde3_iconsdir}/*/*/*/*
-%{_kde3_appsdir}/amarok/images/*
-%{_kde3_appsdir}/profiles/amarok.profile.xml
-%{_kde3_datadir}/config/amarokrc
-%{_kde3_datadir}/config.kcfg/amarok.kcfg
-%{_kde3_appsdir}/konqsidebartng/*
-
-#--------------------------------------------------------------------
-
-%package scripts
-Summary: Scripts for amarok
-Group: Graphical desktop/KDE3
-Requires: %name = %epoch:%version-%release
-URL: http://amarok.kde.org/
-Requires: kde3-kjsembed
-Requires: ruby
-Requires: python
-# (Anssi 05/2008) ruby_lib moved; the package was obsoleted by amarok-scripts:
-Conflicts: %{_lib}amarok0-scripts < 1:1.4.9.1-3
-
-%description scripts
-This package includes python scripts for amarok.
-
-%files scripts
-%defattr(-,root,root)
-%dir %{_kde3_appsdir}/amarok/scripts/
-%{_kde3_appsdir}/amarok/scripts/*
-%_kde3_libdir/ruby_lib/http11.rb
-%_kde3_libdir/ruby_lib/*.la
-%_kde3_libdir/ruby_lib/*.so.*
-
-#--------------------------------------------------------------------
-
-%package -n %{develscripts}
-Summary: Library scripts for amarok
-Group: Graphical desktop/KDE3
-Requires: %{name}-scripts = %epoch:%{version}
-URL: http://amarok.kde.org/
-Requires: ruby
-Obsoletes: %{libname}-devel-scripts
-Provides: %{libname}-devel-scripts
-
-%description -n %{develscripts}
-This package includes devel for scripts for amarok.
-
-%files -n %{develscripts}
-%defattr(-,root,root)
-%_kde3_libdir/ruby_lib/*.so
-
-#------------------------------------------------------------------
-
-%package engine-xine
-Summary: Amarok xine engine
-Group: Graphical desktop/KDE3
-Provides: kde3-amarok-engine
-URL: http://amarok.kde.org/
-Requires: xine-lib
-Requires: xine-plugins
-Requires: %name = %epoch:%version-%release
-
-%description engine-xine
-This package includes xine engine for amarok.
-
-%files engine-xine
-%defattr(-,root,root)
-%{_kde3_libdir}/kde3/libamarok_xine-engine.*
-%{_kde3_datadir}/services/amarok_xine-engine.desktop
-%{_kde3_datadir}/config.kcfg/xinecfg.kcfg
-
-#--------------------------------------------------------------------
-
-%package engine-yauap
-Summary: Amarok yauap engine
-Group: Graphical desktop/KDE3
-URL: http://amarok.kde.org/
-Requires: %name = %epoch:%version-%release
-Conflicts: %name < 1:1.4.8-1
-
-%description engine-yauap
-This package includes yauap engine for amarok.
-
-%files engine-yauap
-%defattr(-,root,root)
-%{_kde3_libdir}/kde3/libamarok_yauap-engine_plugin.*
-%{_kde3_datadir}/services/amarok_yauap-engine_plugin.desktop
-
-#--------------------------------------------------------------------
-
-%package engine-void
-Summary: Amarok void engine
-Group: Graphical desktop/KDE3
-URL: http://amarok.kde.org/
-Requires: %name = %epoch:%version-%release
-Conflicts: %name < 1:1.4.8-4
-
-%description engine-void
-This package includes void engine for amarok.
-
-%files engine-void
-%defattr(-,root,root)
-%{_kde3_libdir}/kde3/libamarok_void-engine_plugin.*
-%{_kde3_datadir}/services/amarok_void-engine_plugin.desktop
-
-#--------------------------------------------------------------------
-
-%package -n %{libname}
-Summary: Amarok library
-Group: Graphical desktop/KDE3
-Provides: %{libname_orig} = %epoch:%{version}-%{release}
-
-%description -n %{libname}
-Library for Amarok
-
-%if %mdkversion < 200900
-%post -n %{libname} -p /sbin/ldconfig
-%endif
-%if %mdkversion < 200900
-%postun -n %{libname} -p /sbin/ldconfig
-%endif
-
-%files -n %{libname}
-%defattr(-,root,root)
-%{_kde3_libdir}/libamarok.so.*
-%{_kde3_libdir}/kde3/konqsidebar_universalamarok.*
-%{_kde3_libdir}/kde3/libamarok_daap-mediadevice.*
-%{_kde3_libdir}/kde3/libamarok_generic-mediadevice.*
-%{_kde3_libdir}/kde3/libamarok_ifp-mediadevice.*
-%{_kde3_libdir}/kde3/libamarok_ipod-mediadevice.*
-%{_kde3_libdir}/kde3/libamarok_massstorage-device.*
-%{_kde3_libdir}/kde3/libamarok_mtp-mediadevice.*
-%{_kde3_libdir}/kde3/libamarok_nfs-device.*
-%{_kde3_libdir}/kde3/libamarok_njb-mediadevice.*
-%{_kde3_libdir}/kde3/libamarok_smb-device.*
-%{_kde3_libdir}/kde3/libamarok_riokarma-mediadevice.*
-
-#--------------------------------------------------------------------
-
-%package -n %{develname}
-Summary: Headers of %name for development
-Group: Development/C
-Requires: %{libname} = %epoch:%{version}
-Provides: %{name}-devel = %epoch:%{version}-%{release}
-Provides: amarok0-devel = %epoch:%{version}-%{release}
-# (Anssi 05/2008) Wrong package name:
-Conflicts: %{_lib}amarok-devel < 1:1.4.9.1-3
-
-%description -n %{develname}
-Headers of %{name} for development.
-
-%files -n %{develname}
-%defattr(-,root,root)
-%{_kde3_libdir}/libamarok.la
-%{_kde3_libdir}/libamarok.so
-
-#--------------------------------------------------------------------
-
-%prep
-%setup -q -n amarok-%version -a 1
-%patch0 -p1 -b .fix_amarok_initial_preference
-%patch1 -p0 -b .fix_amarok_default_config_file
-%patch3 -p1 -b .fix_add_multimedia_shortcut
-%patch6 -p1 -b .add_some_radios
-#%patch8 -p0
-#%patch9 -p1
-#%patch10 -p1
-%if %mdkversion >= 201000
-%patch11 -p1
-#%patch12 -p1
-%patch13 -p1
-%endif
-%patch14 -p0
-%patch15 -p0
-
-%build
-PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
-export xdg_menudir=%_sysconfdir/xdg/kde/menus
-
-make -f admin/Makefile.common cvs
-export QTDIR=%qt3dir
-
-%configure_kde3 --docdir=%_kde3_docdir\
- --with-xine \
- --with-yauap \
- --without-included-sqlite \
- --with-libgpod \
- --without-helix \
- --without-xmms \
- --with-libmtp \
- --with-libkarma \
- --with-ifp \
-%if %build_mysql
- --enable-mysql \
-%endif
-%if %build_postgresql
- --enable-postgresql \
-%endif
-
-%make
-
-%install
-rm -rf %buildroot
-
-%{makeinstall_std}
-
-# install source1
-mkdir -p %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn/dict
-pushd Lyrics_CN
-cp -a * %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn
-find %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn/ -type f | xargs chmod 0644
-chmod 0755 %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn/Lyrics_CN
-popd
-
-#correct wrong script encoding file
-perl -pi -e 's/\015$//' %{buildroot}/%{_kde3_appsdir}/amarok/data/Cool-Streams.xml
-perl -pi -e 's/\015$//' %{buildroot}/%{_kde3_appsdir}/amarok/scripts/playlist2html/README
-perl -pi -e 's/\015$//' %{buildroot}/%{_kde3_appsdir}/amarok/scripts/webcontrol/README
-
-
-%clean
-rm -rf %buildroot
-
-
-
-%changelog
-
-* Mon Jul 25 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.2
-+ Update to Trinity sources
-- Remove amarok-1.4.10-gcc44.patch, fix_autotools.patch, amarok-1.4.9.1-fix-underlinking.patch, amarok-1.4.9.1-libmtp-0.3.0-build-fix.patch
-+ Add kdebase-3.5.12-move-xdg-menu-dir.patch, kdebase-3.5.12-config.patch
-- Remove wikipedia-lookup.patch
-
-* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1:1.4.10-5mvt2010.1
-+ Rebuild for MDV 2010.1
-+ change required version of libgpod to match MDV 2010.1 packages
-
-* Wed Dec 23 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:1.4.10-4mvt2010.0
-- Use upper release number to avoid unwanted KDE4 upgrade
-- Fix automake 1.11 and autoconf 2.65 build issues
-- Fix ifp build for compability autoconf changes
-- Change package group
-
-* Sun Dec 20 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:1.4.10-3mvt2010.0
-+ Last KDE3 verison
-+ Built for 2010.0 release
-+ Added gcc4 patch
-+ Fix wikipedia lookup patch
-+ Fix karma service built
-
-* Tue Sep 02 2008 Helio Chissini de Castro <helio@mandriva.com> 1:1.4.10-2mdv2009.0
-+ Revision: 278767
-- Fix kjsembed and k3b-devel requires
-
-* Thu Aug 14 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.10-1mdv2009.0
-+ Revision: 271697
-- New version 1.4.10
-
-* Fri Jul 18 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-9mdv2009.0
-+ Revision: 238331
-- add patch to build against libmtp 0.3.0
-
-* Thu Jul 03 2008 Adam Williamson <awilliamson@mandriva.com> 1:1.4.9.1-8mdv2009.0
-+ Revision: 231371
-- drop exscalibar (build)requires: moodbar was rewritten not to need exscalibar
- in august 2006
-
- + Pixel <pixel@mandriva.com>
- - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
-
-* Wed Jun 11 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-7mdv2009.0
-+ Revision: 218132
-- add patch to fix underlink
-- rebuild for new configure_kde3
-
- + Pixel <pixel@mandriva.com>
- - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
-
-* Wed Jun 04 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-6mdv2009.0
-+ Revision: 214923
-- BR tcl
-- rebuild for new directfb
-
-* Tue May 20 2008 Anssi Hannula <anssi@mandriva.org> 1:1.4.9.1-5mdv2009.0
-+ Revision: 209512
-- change the libamarok0-scripts obsoletes back to conflict to avoid
- multiple packages obsoleting the same one
-- do not require kde3-amarok in libamarok0 (avoids upgrading users
- getting both kde3-amarok and amarok)
-
- + Funda Wang <fundawang@mandriva.org>
- - libscripts should be obsoleted rather than conflicts
-
-* Tue May 13 2008 Anssi Hannula <anssi@mandriva.org> 1:1.4.9.1-3mdv2009.0
-+ Revision: 206809
-- rename libamarok-devel to libamarok0-devel to avoid conflicts with
- main amarok package
-- drop libamarok0-scripts and move the contents to amarok-scripts
-
-* Mon May 12 2008 Anssi Hannula <anssi@mandriva.org> 1:1.4.9.1-2mdv2009.0
-+ Revision: 206473
-- drop obsoletes that belong to amarok package
-- do not provide libamarok-devel, it conflicts with main amarok devel pkg
-
- + Funda Wang <fundawang@mandriva.org>
- - should be kde3-k3b
-
-* Fri May 09 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-1mdv2009.0
-+ Revision: 204803
-- New version of lyrics_cn plugin
-- New version 1.4.9.1
-
-* Fri May 09 2008 Helio Chissini de Castro <helio@mandriva.com> 1:1.4.8-11mdv2009.0
-+ Revision: 204753
-- Return of kde3 amarok in new /opt path
-- We need old amarok for kde3
-
-* Sat Mar 08 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.8-8mdv2008.1
-+ Revision: 182085
-- New license policy
-- fix lyrics_cn file permission
-
-* Tue Mar 04 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-7mdv2008.1
-+ Revision: 179228
-- Add support for the new amazon web API
-- Remove condition for unsupported version
-
-* Thu Feb 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-6mdv2008.1
-+ Revision: 176529
-- Add transkode as suggest as requested by colin
-
-* Thu Feb 21 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-5mdv2008.1
-+ Revision: 173486
-- Only provide amarok-engine on working engines (Bug #37800)
-- Package void engine in its own package (Bug #37797)
-
-* Sun Feb 10 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-3mdv2008.1
-+ Revision: 164737
-- [FEATURE] Enable mysql and postgresql support (Bug #36392)
- Add upstream patch to fix some pbs on the dynamic mode
-- Move yauap in its own engine package
-
-* Thu Dec 20 2007 Olivier Blin <oblin@mandriva.com> 1:1.4.8-1mdv2008.1
-+ Revision: 135819
-- restore BuildRoot
-
- + Nicolas Lécureuil <neoclust@mandriva.org>
- - New version 1.4.8
-
- + Thierry Vignaud <tvignaud@mandriva.com>
- - kill re-definition of %%buildroot on Pixel's request
-
-* Wed Nov 14 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-14mdv2008.1
-+ Revision: 108663
-- rebuild for new libgpod
-
-* Wed Oct 31 2007 Thierry Vignaud <tvignaud@mandriva.com> 1:1.4.7-12mdv2008.1
-+ Revision: 104176
-- really rebuild for new libmtp
-
-* Sun Oct 28 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-11mdv2008.1
-+ Revision: 102710
-- fix startup of lyrics_CN script
-
-* Sat Oct 27 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-10mdv2008.1
-+ Revision: 102620
-- Rebuild for new libmtp
-- New version of Lyrics_CN plugin
-- suggests moodbar
-
- + Nicolas Lécureuil <neoclust@mandriva.org>
- - Add patch from upstream stable branch (patch 16)
- Add support for other engines and hardware (WIP)
-
-* Mon Sep 03 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-9mdv2008.0
-+ Revision: 78441
-- New version of Lyrics_CN plugin
-
-* Fri Aug 31 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.7-8mdv2008.0
-+ Revision: 76978
-- Add upstream patch: amarok freezes when trying to play mp3 files without mp3 support
-- Add upstream patch that fix a crash with mysql
-- Fix post/postun
-- Add new upstream patches from BRANCH
-
-* Mon Aug 27 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:1.4.7-7mdv2008.0
-+ Revision: 72238
-- Rebuild for locale dir fix
-
-* Sun Aug 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.7-6mdv2008.0
-+ Revision: 71488
-- Add upstream patches from upcoming 1.4.8 release
-
-* Sat Aug 25 2007 Anssi Hannula <anssi@mandriva.org> 1:1.4.7-5mdv2008.0
-+ Revision: 71349
-- rebuild with new rpm-mandriva-setup for find_lang fixes
-
-* Fri Aug 24 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-4mdv2008.0
-+ Revision: 70748
-- fix install of lyric_cn script
-- New version of Lyrics_CN
-
-* Sat Aug 18 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-3mdv2008.0
-+ Revision: 65550
-- New devel policy for scripts-devel
-
-* Sat Aug 18 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-2mdv2008.0
-+ Revision: 65423
-- New devel package policy
-
-* Thu Aug 16 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-1mdv2008.0
-+ Revision: 64501
-- New verison 1.4.7
-
-* Fri Aug 10 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-5mdv2008.0
-+ Revision: 61071
-- finally fix lyric_cn permission
-
-* Sun Aug 05 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-4mdv2008.0
-+ Revision: 59036
-- Rebuild against latest libmtp
-
-* Wed Jun 27 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-3mdv2008.0
-+ Revision: 44942
-- Rebuild against k3b 1.0.2
-- fix permission
-
-* Fri Jun 22 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-2mdv2008.0
-+ Revision: 42938
-- Renew SOURCE1
- fix executive permission
-
-* Wed Jun 20 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.6-1mdv2008.0
-+ Revision: 41932
-- Remove desktop-file-utils require as categories have been merged upstream
-
- + Funda Wang <fundawang@mandriva.org>
- - Kill patch21, merged upstream
- - kill patch 7, merged upstream
- - New upstream version
-
-* Wed Jun 13 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 1:1.4.5-15mdv2008.0
-+ Revision: 38603
-- rebuild for expat
-
-* Fri Jun 01 2007 Herton Ronaldo Krzesinski <herton@mandriva.com.br> 1:1.4.5-14mdv2008.0
-+ Revision: 34341
-- Rebuild with libslang2.
-
- + Nicolas Lécureuil <neoclust@mandriva.org>
- -Add only needed categories
-
-* Sat May 26 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.5-13mdv2008.0
-+ Revision: 31411
-- Rebuild for directfb 1.0
-
- + Nicolas Lécureuil <neoclust@mandriva.org>
- - Add patch21 from upstream (rev: 667738 )
-
-* Wed May 09 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.5-12mdv2008.0
-+ Revision: 25817
-- Rebuild
-- Fix breakage because of wrongly removed macros
-
- + Funda Wang <fundawang@mandriva.org>
- - install with correct permission
-
-* Sat May 05 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.5-10mdv2008.0
-+ Revision: 22912
-- Added lyrics_cn script for Chinese songs.
-
-* Mon Apr 16 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.5-9mdv2008.0
-+ Revision: 13504
-- Bump release
-