summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-01-01 23:24:54 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2015-01-01 23:24:54 +0100
commitee025ae35fa3bd6ed02f7b7515648f50095c717f (patch)
tree4f3acb0501515e84ba17286e55f57165f4ae3dd9
parentcdcb48c071bdc661cc9472a6a68df6d9da0e0842 (diff)
downloadtde-packaging-ee025ae3.tar.gz
tde-packaging-ee025ae3.zip
RPM packaging: update amarok
-rw-r--r--redhat/applications/amarok/amarok-1.4.8-gcc43.patch79
-rw-r--r--redhat/applications/amarok/amarok-14.0.0.spec85
-rw-r--r--redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch193
-rw-r--r--redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch25
-rw-r--r--redhat/applications/amarok/amarok-3.5.13-enable_akode.patch82
-rw-r--r--redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch19
-rw-r--r--redhat/applications/amarok/amarok-3.5.13-fix_gcc47_compilation.patch11
-rw-r--r--redhat/applications/amarok/amarok-3.5.13-fix_inotify_support.patch37
-rw-r--r--redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch46
-rw-r--r--redhat/applications/amarok/amarok-3.5.13-taglib_include.patch40
-rw-r--r--redhat/applications/amarok/amarok-3.5.13.1-add_xine12_support.patch14
-rw-r--r--redhat/applications/amarok/amarok-3.5.13.1-fix_inotify_detection.patch30
-rw-r--r--redhat/applications/amarok/amarok-3.5.13.1.spec406
-rw-r--r--redhat/applications/amarok/amarok-3.5.13.spec381
14 files changed, 48 insertions, 1400 deletions
diff --git a/redhat/applications/amarok/amarok-1.4.8-gcc43.patch b/redhat/applications/amarok/amarok-1.4.8-gcc43.patch
deleted file mode 100644
index 8b0c78133..000000000
--- a/redhat/applications/amarok/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/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 3d74ac57a..8d8c0f680 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -1,58 +1,71 @@
-# Basic package informations
-%define tde_pkg amarok
+#
+# spec file for package amarok (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
%define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg amarok
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 1.4.10
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Media player for TDE
+Group: Applications/Multimedia
+URL: http://www.trinitydesktop.org/
+#Url: http://amarok.kde.org
-Name: trinity-%{tde_pkg}
-Summary: Media player
-Version: 1.4.10
-Release: %{?!preversion:13}%{?preversion:12_%{preversion}}%{?dist}%{?_variant}
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Group: Applications/Multimedia
-License: GPLv2+
-Url: http://amarok.kde.org
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch3: amarok-3.5.13.1-fix_rhel4_libs.patch
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
BuildRequires: trinity-konqueror-devel >= %{tde_version}
-BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
+BuildRequires: cmake >= 2.8
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+
+BuildRequires: alsa-lib-devel
BuildRequires: esound-devel
BuildRequires: gettext
BuildRequires: pcre-devel
-BuildRequires: taglib-devel
# LIBTOOL
BuildRequires: libtool
@@ -310,7 +323,7 @@ xdg-desktop-menu forceupdate 2> /dev/null || :
%package ruby
Summary: %{name} Ruby support
Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
# For dir ownership and some default plugins (lyrics)
Requires: ruby
@@ -347,7 +360,7 @@ Requires: trinity-konqueror
%package visualisation
Summary: Visualisation plugins for Amarok
Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
# No plugins by default, we need libvisual-plugins
#Requires: libvisual-plugins
@@ -364,7 +377,7 @@ use any of xmms' visualisation plugins with Amarok.
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -372,9 +385,7 @@ use any of xmms' visualisation plugins with Amarok.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch3 -p1 -b .rhel4
-%endif
+
%build
unset QTDIR QTINC QTLIB
@@ -454,5 +465,5 @@ done
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-13
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.4.10-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch b/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch
deleted file mode 100644
index b7fec06cc..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-diff -urN amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake amarok.new/amarok/src/mediadevice/daap/ConfigureChecks.cmake
---- amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake 2012-04-13 01:59:24.000000000 -0500
-+++ amarok.new/amarok/src/mediadevice/daap/ConfigureChecks.cmake 2012-05-06 15:18:36.000000000 -0500
-@@ -14,15 +14,51 @@
- tde_message_fatal( "ruby is required, but was not found on your system" )
- endif( )
-
-+# In ruby 1.9.x, ruby.h is located in a different location than previous releases.
- execute_process(
-- COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['archdir'] )"
-- OUTPUT_VARIABLE RUBY_INCLUDE_DIR
-+ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
-+ OUTPUT_VARIABLE RUBY_VERSION_MAJOR
- RESULT_VARIABLE _result
- OUTPUT_STRIP_TRAILING_WHITESPACE )
- if( _result )
- tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
- endif( )
--
-+execute_process(
-+ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MINOR'] )"
-+ OUTPUT_VARIABLE RUBY_VERSION_MINOR
-+ RESULT_VARIABLE _result
-+ OUTPUT_STRIP_TRAILING_WHITESPACE )
-+if( _result )
-+ tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
-+endif( )
-+set( RUBY_VERSION ${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR} )
-+if ( "${RUBY_VERSION}" GREATER "18" )
-+ execute_process(
-+ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['rubyhdrdir'] )"
-+ OUTPUT_VARIABLE RUBY_INCLUDE_DIR
-+ RESULT_VARIABLE _result
-+ OUTPUT_STRIP_TRAILING_WHITESPACE )
-+ if( _result )
-+ tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
-+ endif( )
-+else( )
-+ execute_process(
-+ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['archdir'] )"
-+ OUTPUT_VARIABLE RUBY_INCLUDE_DIR
-+ RESULT_VARIABLE _result
-+ OUTPUT_STRIP_TRAILING_WHITESPACE )
-+ if( _result )
-+ tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
-+ endif( )
-+endif( )
-+execute_process(
-+ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['arch'] )"
-+ OUTPUT_VARIABLE RUBY_ARCH
-+ RESULT_VARIABLE _result
-+ OUTPUT_STRIP_TRAILING_WHITESPACE )
-+if( _result )
-+ tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
-+endif( )
- execute_process(
- COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['LIBRUBYARG_SHARED'] )"
- OUTPUT_VARIABLE RUBY_LDFLAGS
-@@ -36,4 +72,11 @@
- message( STATUS "Found RUBY: ${RUBY_EXECUTABLE}" )
- message( STATUS " RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}" )
- message( STATUS " RUBY_LDFLAGS: ${RUBY_LDFLAGS}" )
-+ message( STATUS " RUBY_VERSION_MAJOR: ${RUBY_VERSION_MAJOR}")
-+ message( STATUS " RUBY_VERSION_MINOR: ${RUBY_VERSION_MINOR}")
-+ message( STATUS " RUBY_ARCH: ${RUBY_ARCH}")
-+endif( )
-+if ( "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}" VERSION_LESS "19" )
-+ message( STATUS " You have an old version of Ruby ! (<1.9)")
-+ set ( HAVE_OLD_RUBY 1 CACHE INTERNAL "" )
- endif( )
-diff -urN amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt amarok.new/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt
---- amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt 2012-04-13 01:59:24.000000000 -0500
-+++ amarok.new/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt 2012-05-06 15:19:57.000000000 -0500
-@@ -15,6 +15,8 @@
- )
-
- include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${RUBY_INCLUDE_DIR}/${RUBY_ARCH}
- ${RUBY_INCLUDE_DIR}
- )
-
-diff -urN amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c amarok.new/amarok/src/mediadevice/daap/mongrel/http11/http11.c
---- amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c 2012-04-13 03:04:44.000000000 -0500
-+++ amarok.new/amarok/src/mediadevice/daap/mongrel/http11/http11.c 2012-05-06 15:13:20.000000000 -0500
-@@ -2,6 +2,7 @@
- * Copyright (c) 2005 Zed A. Shaw
- * You can redistribute it and/or modify it under the same terms as Ruby.
- */
-+#include "config.h"
- #include "ruby.h"
- #include "ext_help.h"
- #include <assert.h>
-@@ -74,7 +75,11 @@
- f = rb_str_dup(global_http_prefix);
- f = rb_str_buf_cat(f, field, flen);
-
-- for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
-+#ifdef HAVE_OLD_RUBY
-+ for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
-+#else
-+ for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) {
-+#endif
- if(*ch == '-') {
- *ch = '_';
- } else {
-@@ -157,12 +162,25 @@
-
- rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);
- if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
-- colon = strchr(RSTRING(temp)->ptr, ':');
-+#ifdef HAVE_OLD_RUBY
-+ colon = strchr(RSTRING(temp)->ptr, ':');
-+#else
-+ colon = strchr(RSTRING_PTR(temp), ':');
-+#endif
- if(colon != NULL) {
-- rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
-+#ifdef HAVE_OLD_RUBY
-+ rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
-+#else
-+ rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp)));
-+#endif
- rb_hash_aset(req, global_server_port,
-- rb_str_substr(temp, colon - RSTRING(temp)->ptr+1,
-- RSTRING(temp)->len));
-+#ifdef HAVE_OLD_RUBY
-+ rb_str_substr(temp, colon - RSTRING(temp)->ptr+1,
-+ RSTRING(temp)->len));
-+#else
-+ rb_str_substr(temp, colon - RSTRING_PTR(temp)+1,
-+ RSTRING_LEN(temp)));
-+#endif
- } else {
- rb_hash_aset(req, global_server_name, temp);
- rb_hash_aset(req, global_server_port, global_port_80);
-@@ -281,8 +299,13 @@
- DATA_GET(self, http_parser, http);
-
- from = FIX2INT(start);
-- dptr = RSTRING(data)->ptr;
-- dlen = RSTRING(data)->len;
-+#ifdef HAVE_OLD_RUBY
-+ dptr = RSTRING(data)->ptr;
-+ dlen = RSTRING(data)->len;
-+#else
-+ dptr = RSTRING_PTR(data);
-+ dlen = RSTRING_LEN(data);
-+#endif
-
- if(from >= dlen) {
- rb_raise(eHttpParserError, "Requested start is after data buffer end.");
-@@ -512,7 +535,11 @@
- if(pref_len == 1 && uri_str[0] == '/') {
- rb_ary_push(result, uri);
- } else {
-- rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len));
-+#ifdef HAVE_OLD_RUBY
-+ rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len));
-+#else
-+ rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING_LEN(uri)));
-+#endif
- }
-
- rb_ary_push(result, (VALUE)handler);
-diff -urN amarok/config.h.cmake amarok.new/config.h.cmake
---- amarok/config.h.cmake 2012-04-13 01:59:26.000000000 -0500
-+++ amarok.new/config.h.cmake 2012-05-06 15:02:40.000000000 -0500
-@@ -16,3 +16,4 @@
-
- #cmakedefine TAGLIB_15 1
- #cmakedefine HAVE_QGLWIDGET 1
-+#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@
-\ No newline at end of file
-diff -urN amarok/configure.in amarok.new/configure.in
---- amarok/configure.in 2012-04-13 01:59:26.000000000 -0500
-+++ amarok.new/configure.in 2012-05-06 14:53:40.000000000 -0500
-@@ -1162,7 +1162,14 @@
-
- AC_PATH_PROG(RUBY, ruby, no)
-
--ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]
-+if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
-+ # Ruby 1.9
-+ ruby_includes=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
-+else
-+ # not Ruby 1.9
-+ ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]
-+fi
-+
- ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`]
-
- AC_SUBST(ruby_includes)
diff --git a/redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch b/redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch
deleted file mode 100644
index 43c858eec..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ConfigureChecks.cmake.ORI 2011-11-26 21:50:35.425026387 +0100
-+++ ConfigureChecks.cmake 2011-11-26 22:24:21.307053676 +0100
-@@ -88,7 +88,12 @@
-
- pkg_search_module( SDL sdl )
- if( NOT SDL_FOUND )
-- tde_message_fatal( "SDL are required, but not found on your system" )
-+ check_include_file( SDL/SDL.h HAVE_SDL_H )
-+ if( NOT HAVE_SDL_H )
-+ tde_message_fatal( "SDL are required, but not found on your system" )
-+ endif ( )
-+ set ( SDL_INCLUDE_DIRS /usr/include/SDL )
-+ set ( SDL_LIBRARIES SDL pthread )
- endif( )
-
- pkg_search_module( LIBVISUAL libvisual-0.4 )
-@@ -163,7 +168,7 @@
- set( CMAKE_REQUIRED_DEFINITIONS ${TQT_CFLAGS_OTHER} )
- set( CMAKE_REQUIRED_INCLUDES ${TDE_INCLUDE_DIR};${TQT_INCLUDE_DIRS};${CMAKE_INCLUDE_PATH} )
- set( CMAKE_REQUIRED_FLAGS "-include tqt.h" )
-- set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} ${TQT_LIBRARIES} )
-+ set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} -L${QT_LIBRARY_DIRS} ${TQT_LIBRARIES} )
- check_cxx_source_compiles("
- #include <konqsidebarplugin.h>
- int main(int, char**) { return 0; } "
diff --git a/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch b/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
deleted file mode 100644
index 16ed9beb9..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Nuar amarok.ORI/amarok/src/engine/akode/CMakeLists.txt amarok.P/amarok/src/engine/akode/CMakeLists.txt
---- amarok.ORI/amarok/src/engine/akode/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
-+++ amarok.P/amarok/src/engine/akode/CMakeLists.txt 2012-01-16 21:42:52.701799667 +0100
-@@ -0,0 +1,37 @@
-+#################################################
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/amarok/src/amarokcore
-+ ${CMAKE_SOURCE_DIR}/amarok/src
-+ ${CMAKE_SOURCE_DIR}/amarok/src/engine/akode
-+ ${TDE_INCLUDE_DIR}
-+ ${TQT_INCLUDE_DIRS}
-+ ${AKODE_INCLUDE_DIRS}
-+)
-+
-+link_directories(
-+ ${TQT_LIBRARY_DIRS}
-+)
-+
-+
-+##### other data ################################
-+
-+install( FILES amarok_aKode-engine.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-+
-+
-+##### libamarok_aKode-engine (module) ############
-+
-+tde_add_kpart( libamarok_aKode-engine AUTOMOC
-+ SOURCES
-+ akode-scope.cpp akode-engine.cpp
-+ LINK amarok-shared ${AKODE_LIBRARIES}
-+ DESTINATION ${PLUGIN_INSTALL_DIR}
-+)
-diff -Nuar amarok.ORI/amarok/src/engine/CMakeLists.txt amarok.P/amarok/src/engine/CMakeLists.txt
---- amarok.ORI/amarok/src/engine/CMakeLists.txt 2012-01-16 21:26:50.433584399 +0100
-+++ amarok.P/amarok/src/engine/CMakeLists.txt 2012-01-16 21:27:36.702218362 +0100
-@@ -14,3 +14,4 @@
- add_subdirectory( void )
- tde_conditional_add_subdirectory( WITH_XINE xine )
- tde_conditional_add_subdirectory( WITH_YAUAP yauap )
-+tde_conditional_add_subdirectory( WITH_AKODE akode )
-diff -Nuar amarok.ORI/CMakeLists.txt amarok.P/CMakeLists.txt
---- amarok.ORI/CMakeLists.txt 2012-01-16 21:26:50.418583977 +0100
-+++ amarok.P/CMakeLists.txt 2012-01-16 21:28:23.382857595 +0100
-@@ -47,6 +47,7 @@
- option( WITH_KONQSIDEBAR "Enable konqsidebar plugin" OFF )
- option( WITH_XINE "Enable xine-engine support" OFF )
- option( WITH_YAUAP "Enable yauap-engine support" OFF )
-+option( WITH_AKODE "Enable akode-engine support" OFF )
- option( WITH_IPOD "Enable iPod support from libgpod" OFF )
- option( WITH_IFP "Enable ifp support" OFF )
- option( WITH_NJB "Enable njb support" OFF )
-diff -Nuar amarok.ORI/ConfigureChecks.cmake amarok.P/ConfigureChecks.cmake
---- amarok.ORI/ConfigureChecks.cmake 2012-01-16 21:26:50.491585184 +0100
-+++ amarok.P/ConfigureChecks.cmake 2012-01-16 21:40:55.883193781 +0100
-@@ -121,6 +121,18 @@
- endif( )
- endif( )
-
-+# akode-engine
-+if( WITH_AKODE )
-+ pkg_search_module( AKODE akode )
-+ if( AKODE_FOUND )
-+ if( ${AKODE_VERSION} VERSION_LESS "2.0.0" )
-+ tde_message_fatal( "your akode version is too old; at least 2.0.0 is required" )
-+ endif( )
-+ else( )
-+ tde_message_fatal( "akode is requested, but was not found on your system" )
-+ endif( )
-+endif( )
-+
-
- # iPod
- if( WITH_IPOD )
diff --git a/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch b/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch
deleted file mode 100644
index 7bbd11fca..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- amarok/amarok/src/mediadevice/riokarma/CMakeLists.txt.ORI 2011-11-28 21:59:41.607054279 +0100
-+++ amarok/amarok/src/mediadevice/riokarma/CMakeLists.txt 2011-11-28 21:59:50.413975791 +0100
-@@ -9,7 +9,7 @@
- #
- #################################################
-
--tde_message_fatal( "riokarma support is not buildable, it needs to link to karma-sharp.dll" )
-+#tde_message_fatal( "riokarma support is not buildable, it needs to link to karma-sharp.dll" )
-
- include( ConfigureChecks.cmake )
-
-@@ -38,6 +38,6 @@
-
- tde_add_kpart( libamarok_riokarma-mediadevice AUTOMOC
- SOURCES riokarmamediadevice.cpp
-- LINK amarok-shared ${KARMA_LIBRARIES}
-+ LINK amarok-shared ${KARMA_LIBRARIES} karma
- DESTINATION ${PLUGIN_INSTALL_DIR}
- )
diff --git a/redhat/applications/amarok/amarok-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/amarok/amarok-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 79cfb5940..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- amarok/amarok/src/mediadevice/mtp/mtpmediadevice.cpp.ORI 2012-05-01 11:44:16.868838499 +0200
-+++ amarok/amarok/src/mediadevice/mtp/mtpmediadevice.cpp 2012-05-01 11:44:27.427731738 +0200
-@@ -24,6 +24,8 @@
-
- #define DEBUG_PREFIX "MtpMediaDevice"
-
-+#include <stdlib.h>
-+
- #include <config.h>
- #include "mtpmediadevice.h"
-
diff --git a/redhat/applications/amarok/amarok-3.5.13-fix_inotify_support.patch b/redhat/applications/amarok/amarok-3.5.13-fix_inotify_support.patch
deleted file mode 100644
index 46798b363..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-fix_inotify_support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 899586da27ae7a85cea8637849a964a88f3df8b2
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1326222183 -0600
-
- Fix inotify detection
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 0e14311..090c73b 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -21,7 +21,25 @@ check_type_size( "long" SIZEOF_LONG BUILTIN_TYPES_ONLY )
-
- check_include_file( stdint.h HAVE_STDINT_H )
- check_include_file( systems.h HAVE_SYSTEMS_H )
--check_include_file( linux/inotify.h HAVE_INOTIFY )
-+
-+##### check for inotify ###########################
-+
-+# if( WITH_INOTIFY )
-+ check_include_file( "inotify.h" INOTIFY_FOUND )
-+ check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND )
-+ if( NOT INOTIFY_FOUND )
-+ if( NOT INOTIFY_SYS_FOUND )
-+ message(FATAL_ERROR "\ninotify support was requested, but inotify was not found on your system" )
-+ endif( NOT INOTIFY_SYS_FOUND )
-+ endif( NOT INOTIFY_FOUND )
-+ if( INOTIFY_FOUND )
-+ set( HAVE_INOTIFY 1 )
-+ endif( INOTIFY_FOUND )
-+ if( INOTIFY_SYS_FOUND )
-+ set( HAVE_INOTIFY 1 )
-+ set( HAVE_SYS_INOTIFY 1 )
-+ endif( INOTIFY_SYS_FOUND )
-+# endif( )
-
- check_function_exists( statvfs HAVE_STATVFS )
-
diff --git a/redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch b/redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch
deleted file mode 100644
index 82d3542c6..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 6e5a3b666215cef086b9116b834475227dbf9343
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1327529588 -0600
-
- Fix linear alphabet string errors
-
-diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c
-index 1d55403..2b1d3e0 100644
---- a/amarok/src/sqlite/sqlite3.c
-+++ b/amarok/src/sqlite/sqlite3.c
-@@ -11964,7 +11964,7 @@ int os2OpenDirectory(
- SQLITE_PRIVATE int sqlite3Os2TempFileName( char *zBuf ){
- static const unsigned char zChars[] =
- "abcdefghijklmnopqrstuvwxyz"
-- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
-+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "0123456789";
- int i, j;
- PSZ zTempPath = 0;
-@@ -13914,7 +13914,7 @@ SQLITE_PRIVATE int sqlite3UnixTempFileName(char *zBuf){
- };
- static const unsigned char zChars[] =
- "abcdefghijklmnopqrstuvwxyz"
-- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
-+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "0123456789";
- int i, j;
- struct stat buf;
-@@ -17014,7 +17014,7 @@ static int winOpenDirectory(
- SQLITE_PRIVATE int sqlite3WinTempFileName(char *zBuf){
- static char zChars[] =
- "abcdefghijklmnopqrstuvwxyz"
-- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
-+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "0123456789";
- int i, j;
- char zTempPath[SQLITE_TEMPNAME_SIZE];
-@@ -48880,7 +48880,7 @@ static void loadExt(sqlite3_context *context, int argc, sqlite3_value **argv){
- static void randStr(sqlite3_context *context, int argc, sqlite3_value **argv){
- static const unsigned char zSrc[] =
- "abcdefghijklmnopqrstuvwxyz"
-- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
-+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "0123456789"
- ".-!,:*^+=_|?/<> ";
- int iMin, iMax, n, r, i;
diff --git a/redhat/applications/amarok/amarok-3.5.13-taglib_include.patch b/redhat/applications/amarok/amarok-3.5.13-taglib_include.patch
deleted file mode 100644
index 31f5fc0fa..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-taglib_include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- amarok/amarok/src/metadata/audible/CMakeLists.txt.ORI 2011-11-26 22:09:05.179043399 +0100
-+++ amarok/amarok/src/metadata/audible/CMakeLists.txt 2011-11-26 22:10:35.537172082 +0100
-@@ -13,6 +13,7 @@
- ${CMAKE_BINARY_DIR}
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-+ ${TAGLIB_INCLUDE_DIRS}
- )
-
-
---- amarok/amarok/src/metadata/aac/CMakeLists.txt.ORI 2011-11-26 22:14:32.341267875 +0100
-+++ amarok/amarok/src/metadata/aac/CMakeLists.txt 2011-11-26 22:14:45.323999002 +0100
-@@ -12,6 +12,7 @@
- include_directories(
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-+ ${TAGLIB_INCLUDE_DIRS}
- )
-
-
---- amarok/amarok/src/metadata/wav/CMakeLists.txt.ORI 2011-11-26 22:16:31.602120951 +0100
-+++ amarok/amarok/src/metadata/wav/CMakeLists.txt 2011-11-26 22:16:51.088400461 +0100
-@@ -13,6 +13,7 @@
- ${CMAKE_BINARY_DIR}
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-+ ${TAGLIB_INCLUDE_DIRS}
- )
-
-
---- amarok/amarok/src/collectionscanner/CMakeLists.txt.ORI 2011-11-26 22:26:39.201579899 +0100
-+++ amarok/amarok/src/collectionscanner/CMakeLists.txt 2011-11-26 22:26:58.736094930 +0100
-@@ -15,6 +15,7 @@
- ${CMAKE_SOURCE_DIR}/amarok/src
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-+ ${TAGLIB_INCLUDE_DIRS}
- )
-
- link_directories(
diff --git a/redhat/applications/amarok/amarok-3.5.13.1-add_xine12_support.patch b/redhat/applications/amarok/amarok-3.5.13.1-add_xine12_support.patch
deleted file mode 100644
index 2328a62b8..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.1-add_xine12_support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- amarok-3.5.13.1/amarok/src/engine/xine/xine-engine.cpp.ORI 2012-10-02 20:00:20.751039350 +0000
-+++ amarok-3.5.13.1/amarok/src/engine/xine/xine-engine.cpp 2012-10-02 20:05:34.336512276 +0000
-@@ -1131,7 +1131,11 @@
-
- bool XineEngine::getAudioCDContents(const TQString &device, KURL::List &urls)
- {
-+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
-+ const char * const* xine_urls = NULL;
-+#else
- char **xine_urls = NULL;
-+#endif
- int num;
- int i = 0;
-
diff --git a/redhat/applications/amarok/amarok-3.5.13.1-fix_inotify_detection.patch b/redhat/applications/amarok/amarok-3.5.13.1-fix_inotify_detection.patch
deleted file mode 100644
index ae5dc8c65..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.1-fix_inotify_detection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- amarok-3.5.13.1/ConfigureChecks.cmake.ORI 2012-10-11 22:49:54.765461343 +0200
-+++ amarok-3.5.13.1/ConfigureChecks.cmake 2012-10-11 22:49:59.897357764 +0200
-@@ -24,7 +24,7 @@
-
- ##### check for inotify ###########################
-
--# if( WITH_INOTIFY )
-+if( WITH_INOTIFY )
- check_include_file( "inotify.h" INOTIFY_FOUND )
- check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND )
- if( NOT INOTIFY_FOUND )
-@@ -39,7 +39,7 @@
- set( HAVE_INOTIFY 1 )
- set( HAVE_SYS_INOTIFY 1 )
- endif( INOTIFY_SYS_FOUND )
--# endif( )
-+endif( )
-
- check_function_exists( statvfs HAVE_STATVFS )
-
---- amarok-3.5.13.1/CMakeLists.txt.ori 2012-10-11 22:50:45.323440818 +0200
-+++ amarok-3.5.13.1/CMakeLists.txt 2012-10-11 22:51:00.569133033 +0200
-@@ -54,6 +54,7 @@
- option( WITH_MTP "Enable mtp support" OFF )
- option( WITH_RIOKARMA "Enable riokarma support" OFF )
- option( WITH_DAAP "Enable daap support" OFF )
-+option( WITH_INOTIFY "Enable inotify support" OFF )
-
-
- ##### user requested modules ####################
diff --git a/redhat/applications/amarok/amarok-3.5.13.1.spec b/redhat/applications/amarok/amarok-3.5.13.1.spec
deleted file mode 100644
index 08d594486..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.1.spec
+++ /dev/null
@@ -1,406 +0,0 @@
-# Basic package informations
-%define kdecomp amarok
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: Media player
-Version: 1.4.10
-Release: 8%{?dist}%{?_variant}
-
-Group: Applications/Multimedia
-License: GPLv2+
-Url: http://amarok.kde.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: amarok-3.5.13.1.tar.gz
-
-Patch1: amarok-3.5.13.1-add_xine12_support.patch
-Patch2: amarok-3.5.13.1-fix_inotify_detection.patch
-Patch3: amarok-3.5.13.1-fix_rhel4_libs.patch
-
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires: trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: trinity-akode-devel
-BuildRequires: trinity-konqueror-devel >= 3.5.13.1
-
-BuildRequires: alsa-lib-devel
-BuildRequires: desktop-file-utils
-BuildRequires: esound-devel
-BuildRequires: gettext
-BuildRequires: pcre-devel
-BuildRequires: taglib-devel
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libmp4v2-devel
-%endif
-
-BuildRequires: libtool
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libtool-ltdl-devel
-%endif
-BuildRequires: libusb-devel
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-BuildRequires: SDL-devel
-BuildRequires: taglib-devel
-BuildRequires: sqlite-devel
-# not used anymore, in favor of libvisual ? -- Rex
-#%{?fedora:BuildRequires: xmms-devel}
-
-
-# DBUS support
-%if 0%{?suse_version}
-BuildRequires: dbus-1-devel
-%else
-BuildRequires: dbus-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires: dbus-qt
-%else
-BuildRequires: trinity-dbus-tqt-devel >= 3.5.13.1
-%endif
-
-# IFP support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_ifp 1
-BuildRequires: libifp-devel
-%endif
-
-# KARMA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define with_karma 1
-BuildRequires: libkarma-devel
-BuildRequires: karma-sharp
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-
-# GPOD (ipod) support
-%define with_gpod 1
-%if 0%{?rhel} == 5
-BuildRequires: trinity-libgpod-devel >= 0.4.2
-%else
-BuildRequires: libgpod-devel >= 0.4.2
-%endif
-
-# MTP players
-%define with_mtp 1
-BuildRequires: libmtp-devel
-BuildRequires: libmusicbrainz-devel
-
-# Creative Nomad Jukebox
-%define with_njb 1
-BuildRequires: libnjb-devel
-
-# VISUAL support
-%define with_libvisual 1
-BuildRequires: libvisual-devel
-
-# TUNEPIMP support
-BuildRequires: libtunepimp-devel
-
-# INOTIFY support
-%define with_inotify 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}inotifytools-devel
-%endif
-
-# XINE support
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: xine-lib-devel
-%endif
-
-# YAUAP support
-%define with_yauap 1
-
-%endif
-
-# ruby
-BuildRequires: ruby
-BuildRequires: ruby-devel
-
-# To open the selected browser, works with Patch2
-Requires: xdg-utils
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
-
-%description
-Amarok is a multimedia player with:
- - fresh playlist concept, very fast to use, with drag and drop
- - plays all formats supported by the various engines
- - audio effects, like reverb and compressor
- - compatible with the .m3u and .pls formats for playlists
- - nice GUI, integrates into the TDE look, but with a unique touch
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
-%{tde_bindir}/amarok
-%{tde_bindir}/amarokapp
-%{tde_bindir}/amarokcollectionscanner
-%{tde_bindir}/amarok_proxy.rb
-%{tde_datadir}/apps/amarok/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/servicetypes/*.desktop
-%{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_datadir}/config/amarokrc
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/services/amarokitpc.protocol
-%{tde_datadir}/services/amaroklastfm.protocol
-%{tde_datadir}/services/amarokpcast.protocol
-# -libs ? -- Rex
-%{tde_libdir}/libamarok.so.0
-%{tde_libdir}/libamarok.so.0.0.0
-# DAAP
-%{tde_bindir}/amarok_daapserver.rb
-%{tde_tdelibdir}/libamarok_daap-mediadevice.*
-%{tde_datadir}/services/amarok_daap-mediadevice.desktop
-# Mass-storage
-%{tde_datadir}/services/amarok_massstorage-device.desktop
-%{tde_tdelibdir}/libamarok_massstorage-device.*
-# NFS
-%{tde_datadir}/services/amarok_nfs-device.desktop
-%{tde_tdelibdir}/libamarok_nfs-device.*
-# SMB
-%{tde_datadir}/services/amarok_smb-device.desktop
-%{tde_tdelibdir}/libamarok_smb-device.*
-# IPod
-%if 0%{?with_gpod}
-%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
-%endif
-# VFAT
-%{tde_datadir}/services/amarok_generic-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_generic-mediadevice.*
-# iRiver
-%if 0%{?with_ifp}
-%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
-%endif
-# Creative Zen
-%if 0%{?with_njb}
-%{tde_datadir}/services/amarok_njb-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_njb-mediadevice.*
-%endif
-# MTP players
-%if 0%{?with_mtp}
-%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
-%endif
-# Rio Karma
-%if 0%{?with_karma}
-%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
-%endif
-# Void engine (noop)
-%{tde_datadir}/services/amarok_void-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_void-engine_plugin.*
-# Xine engine
-%if 0%{?with_xine}
-%{tde_datadir}/services/amarok_xine-engine.desktop
-%{tde_tdelibdir}/libamarok_xine-engine.*
-%endif
-## Gstreamer engine
-#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
-# YAUAP
-%if 0%{?with_yauap}
-%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
-%endif
-# AKODE
-%{tde_datadir}/services/amarok_aKode-engine.desktop
-%{tde_tdelibdir}/libamarok_aKode-engine.*
-
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-
-##########
-
-%package ruby
-Summary: %{name} Ruby support
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-# For dir ownership and some default plugins (lyrics)
-Requires: ruby
-
-%description ruby
-%{summary}.
-
-%files ruby
-%defattr(-,root,root,-)
-%{tde_libdir}/ruby_lib/*
-
-##########
-
-%package konqueror
-Summary: Amarok konqueror (service menus, sidebar) support
-Group: Applications/Multimedia
-
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-konqueror
-
-%description konqueror
-%{summary}.
-
-%files konqueror
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_tdelibdir}/konqsidebar_universalamarok.*
-%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
-
-
-##########
-
-%if 0%{?with_libvisual}
-
-%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.
-
-%files visualisation
-%defattr(-,root,root,-)
-%{tde_bindir}/amarok_libvisual
-
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n amarok-3.5.13.1
-%patch1 -p1 -b .xine
-%patch2 -p1 -b .inotify
-%if 0%{?rhel} == 4
-%patch3 -p1 -b .rhel4
-%endif
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
- -DQT_LIBRARY_DIRS="${QTLIB:-${QTDIR}/%{_lib}}" \
- %{?with_libvisual:-DWITH_LIBVISUAL=ON} \
- -DWITH_KONQSIDEBAR=ON \
- %{?with_xine:-DWITH_XINE=ON} \
- %{?with_yauap:-DWITH_YAUAP=ON} \
- -DWITH_AKODE=ON \
- %{?with_gpod:-DWITH_IPOD=ON} \
- %{?with_ifp:-DWITH_IFP=ON} \
- %{?with_njb:-DWITH_NJB=ON} \
- %{?with_mtp:-DWITH_MTP=ON} \
- %{?with_karma:-DWITH_RIOKARMA=ON} \
- %{?with_inotify:-DWITH_INOTIFY=ON} \
- -DWITH_DAAP=ON \
- -DBUILD_ALL=ON \
- ..
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -fr $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-
-# unpackaged files
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-# Removes '.so' to avoid automatic -devel dependency
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
-
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- [ "$lang" == "en" ] && d=en/amarok || d=$lang
- echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> %{name}.lang
- fi
-done
-
-# Locales
-for locale in $RPM_BUILD_ROOT%{tde_datadir}/locale/* ; do
- if [ -r $locale/LC_MESSAGES/amarok.mo ]; then
- lang=$(basename $locale)
- echo "%lang($lang) %{tde_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang
- fi
-done
-
-
-%clean
-%__rm -fr $RPM_BUILD_ROOT
-
-
-%changelog
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-8
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/amarok/amarok-3.5.13.spec b/redhat/applications/amarok/amarok-3.5.13.spec
deleted file mode 100644
index e246498ea..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.spec
+++ /dev/null
@@ -1,381 +0,0 @@
-# Basic package informations
-%define kdecomp amarok
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: Media player
-Version: 1.4.10
-Release: 7%{?dist}%{?_variant}
-
-Group: Applications/Multimedia
-License: GPLv2+
-Url: http://amarok.kde.org
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: amarok-3.5.13.tar.gz
-
-# RedHat / Fedora legacy patches
-Patch1: amarok-1.4.8-gcc43.patch
-
-# TDE 3.5.13 RHEL/Fedora patches
-Patch2: amarok-3.5.13-cmake_konqsidebar.patch
-Patch3: amarok-3.5.13-taglib_include.patch
-Patch4: amarok-3.5.13-enable_riokarma.patch
-Patch5: amarok-3.5.13-enable_akode.patch
-
-Patch6: amarok-3.5.13-adds_ruby_1.9_support.patch
-Patch7: amarok-3.5.13-fix_gcc47_compilation.patch
-
-# [amarok] Fix inotify detection [Commit #899586da]
-Patch11: amarok-3.5.13-fix_inotify_support.patch
-# [amarok] Fix linear alphabet string errors [Commit #6e5a3b66]
-Patch12: amarok-3.5.13-fix_linear_alphabet.patch
-
-BuildRequires: alsa-lib-devel
-BuildRequires: desktop-file-utils
-BuildRequires: esound-devel
-BuildRequires: gettext
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: pcre-devel
-BuildRequires: taglib-devel
-BuildRequires: libifp-devel
-# Ipod
-%if 0%{?rhel} == 5
-BuildRequires: trinity-libgpod-devel >= 0.4.2
-%else
-BuildRequires: libgpod-devel >= 0.4.2
-%endif
-BuildRequires: libmp4v2-devel
-# MTP players
-BuildRequires: libmtp-devel
-BuildRequires: libmusicbrainz-devel
-# Creative Nomad Jukebox
-BuildRequires: libnjb-devel
-BuildRequires: libtool
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libtool-ltdl-devel
-%endif
-BuildRequires: libtunepimp-devel
-BuildRequires: libusb-devel
-BuildRequires: libvisual-devel
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-BuildRequires: SDL-devel
-BuildRequires: taglib-devel
-BuildRequires: sqlite-devel
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: trinity-libkarma-devel
-BuildRequires: trinity-karma-sharp
-%else
-BuildRequires: libkarma-devel
-BuildRequires: karma-sharp
-%endif
-# not used anymore, in favor of libvisual ? -- Rex
-#%{?fedora:BuildRequires: xmms-devel}
-BuildRequires: dbus-devel
-BuildRequires: dbus-tqt-devel
-BuildRequires: trinity-akode-devel
-BuildRequires: trinity-konqueror-devel
-
-# ruby
-BuildRequires: ruby
-BuildRequires: ruby-devel
-
-# To open the selected browser, works with Patch2
-Requires: xdg-utils
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
-# xine-lib
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libxine-devel
-%else
-BuildRequires: xine-lib-devel
-%endif
-
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}inotifytools-devel
-%else
-%endif
-
-
-%description
-Amarok is a multimedia player with:
- - fresh playlist concept, very fast to use, with drag and drop
- - plays all formats supported by the various engines
- - audio effects, like reverb and compressor
- - compatible with the .m3u and .pls formats for playlists
- - nice GUI, integrates into the TDE look, but with a unique touch
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
-%{tde_bindir}/amarok
-%{tde_bindir}/amarokapp
-%{tde_bindir}/amarokcollectionscanner
-%{tde_bindir}/amarok_proxy.rb
-%{tde_datadir}/apps/amarok/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/servicetypes/*.desktop
-%{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_datadir}/config/amarokrc
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/services/amarokitpc.protocol
-%{tde_datadir}/services/amaroklastfm.protocol
-%{tde_datadir}/services/amarokpcast.protocol
-# -libs ? -- Rex
-%{tde_libdir}/libamarok.so.0
-%{tde_libdir}/libamarok.so.0.0.0
-# DAAP
-%{tde_bindir}/amarok_daapserver.rb
-%{tde_tdelibdir}/libamarok_daap-mediadevice.*
-%{tde_datadir}/services/amarok_daap-mediadevice.desktop
-# Mass-storage
-%{tde_datadir}/services/amarok_massstorage-device.desktop
-%{tde_tdelibdir}/libamarok_massstorage-device.*
-# NFS
-%{tde_datadir}/services/amarok_nfs-device.desktop
-%{tde_tdelibdir}/libamarok_nfs-device.*
-# SMB
-%{tde_datadir}/services/amarok_smb-device.desktop
-%{tde_tdelibdir}/libamarok_smb-device.*
-# IPod
-%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
-# VFAT
-%{tde_datadir}/services/amarok_generic-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_generic-mediadevice.*
-# iRiver
-%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
-# Creative Zen
-%{tde_datadir}/services/amarok_njb-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_njb-mediadevice.*
-# MTP players
-%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
-# Rio Karma
-%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
-# Void engine (noop)
-%{tde_datadir}/services/amarok_void-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_void-engine_plugin.*
-# Xine engine
-%{tde_datadir}/services/amarok_xine-engine.desktop
-%{tde_tdelibdir}/libamarok_xine-engine.*
-## Gstreamer engine
-#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
-# YAUAP
-%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
-# AKODE
-%{tde_datadir}/services/amarok_aKode-engine.desktop
-%{tde_tdelibdir}/libamarok_aKode-engine.*
-
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-
-##########
-
-%package ruby
-Summary: %{name} Ruby support
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-# For dir ownership and some default plugins (lyrics)
-Requires: ruby
-
-%description ruby
-%{summary}.
-
-%files ruby
-%defattr(-,root,root,-)
-%{tde_libdir}/ruby_lib/*
-
-##########
-
-%package konqueror
-Summary: Amarok konqueror (service menus, sidebar) support
-Group: Applications/Multimedia
-
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-konqueror
-
-%description konqueror
-%{summary}.
-
-%files konqueror
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_tdelibdir}/konqsidebar_universalamarok.*
-%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
-
-
-##########
-
-%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.
-
-%files visualisation
-%defattr(-,root,root,-)
-%{tde_bindir}/amarok_libvisual
-
-##########
-
-
-%prep
-%setup -q -n applications/amarok
-%patch1 -p1 -b .gcc43
-%patch2 -p0
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .ruby
-%patch7 -p1
-
-%patch11 -p1 -b .inotify
-%patch12 -p1 -b .alphabet
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
- -DQT_LIBRARY_DIRS="${QTLIB}" \
- -DWITH_LIBVISUAL=ON \
- -DWITH_KONQSIDEBAR=ON \
- -DWITH_XINE=ON \
- -DWITH_YAUAP=ON \
- -DWITH_AKODE=ON \
- -DWITH_IPOD=ON \
- -DWITH_IFP=ON \
- -DWITH_NJB=ON \
- -DWITH_MTP=ON \
- -DWITH_RIOKARMA=ON \
- -DWITH_DAAP=ON \
- -DBUILD_ALL=ON \
- ..
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -fr $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-
-# unpackaged files
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-# Removes '.so' to avoid automatic -devel dependency
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
-
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- [ "$lang" == "en" ] && d=en/amarok || d=$lang
- echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> %{name}.lang
- fi
-done
-
-# Locales
-for locale in $RPM_BUILD_ROOT%{tde_datadir}/locale/* ; do
- if [ -r $locale/LC_MESSAGES/amarok.mo ]; then
- lang=$(basename $locale)
- echo "%lang($lang) %{tde_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang
- fi
-done
-
-
-
-%clean
-%__rm -fr $RPM_BUILD_ROOT
-
-
-
-
-
-
-%changelog
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-7
-- Fix linear alphabet string errors [Commit #6e5a3b66]
-- Fix dependencies issues with -devel packages.
-
-* Mon Apr 29 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-6
-- Rebuilt for Fedora 17
-- Fix compilation with GCC 4.7
-- Fix inotify detection [Commit #899586da]
-
-* Mon Mar 19 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-5
-- Replaces BR "libgpod" with "trinity-libgpod" for EL5
-
-* Mon Jan 16 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-4
-- Enable 'akode' support
-- Removes 'libvisual-plugins' dependency (obsolete ?)
-
-* Mon Nov 28 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-3
-- Enable riokarma support
-- Enhance localized files packaging
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-2
-- Enable RHEL 5 compilation
-- Add konqueror sidebar
-
-* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-1
-- Initial release for TDE 3.5.13 on RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Spec file based on Fedora 8 'amarok-1.4.10-1'