RPM: massive update and cleanup

3 files changed, 38 insertions, 481 deletions

diff --git a/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch b/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch
deleted file mode 100644
index 0b6d3259b..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- amarok-3.5.13.1/amarok/src/engine/yauap/ConfigureChecks.cmake.ORI	2012-10-11 22:54:02.017468265 +0200
-+++ amarok-3.5.13.1/amarok/src/engine/yauap/ConfigureChecks.cmake	2012-10-11 22:54:52.644445209 +0200
-@@ -16,8 +16,8 @@
- endif( )
- 
- # dbus-tqt
--pkg_search_module( DBUS_TQT dbus-tqt )
--if( NOT DBUS_TQT_FOUND )
--  tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
--endif( )
-+#pkg_search_module( DBUS_TQT dbus-tqt )
-+#if( NOT DBUS_TQT_FOUND )
-+#  tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
-+#endif( )
- 
diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec
deleted file mode 100644
index 9f6c153db..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.2.spec
+++ /dev/null
@@ -1,438 +0,0 @@
-# Basic package informations
-%define tde_pkg amarok
-%define tde_version 3.5.13.2
-
-# TDE 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-%{tde_pkg}
-Summary:		Media player
-Version:		1.4.10
-Release:		%{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}
-
-Group:			Applications/Multimedia
-License:		GPLv2+
-Url:			http://amarok.kde.org
-
-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:	esound-devel
-BuildRequires:	gettext
-BuildRequires:	pcre-devel
-BuildRequires:	taglib-devel 
-
-# LIBTOOL
-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
-
-# DBUS-(T)QT support
-%if 0%{?rhel} == 4
-BuildRequires:	dbus-qt
-%else
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-%endif
-
-# IFP support
-#  IFP package is broken under PCLinuxOS.
-%if 0%{?pclinuxos} == 0
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_ifp 1
-BuildRequires:	libifp-devel
-%endif
-%endif
-
-# KARMA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-%define with_karma 1
-BuildRequires:	libkarma-devel
-BuildRequires:	karma-sharp
-%endif
-%endif
-
-# GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_gpod 1
-BuildRequires:	libgpod-devel >= 0.4.2
-%endif
-
-# MTP players
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_mtp 1
-BuildRequires:	libmtp-devel
-BuildRequires:	libmusicbrainz-devel
-%endif
-
-# Creative Nomad Jukebox
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-%define with_njb 1
-BuildRequires:	libnjb-devel
-%endif
-
-# VISUAL support
-%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_libvisual 1
-BuildRequires:	libvisual-devel
-%endif
-
-# TUNEPIMP support
-%if 0%{?mgaversion} && 0%{?mgaversion} <= 2
-BuildRequires:	libtunepimp-devel
-%endif
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:	libtunepimp-devel
-%endif
-
-# INOTIFY support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_inotify 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}inotifytools-devel
-%endif
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# YAUAP support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_yauap 1
-%endif
-
-# AKODE support
-%if 0
-%define with_akode 1
-BuildRequires:	trinity-akode-devel
-%endif
-
-# MP4V2 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_mp4v2 1
-BuildRequires:	libmp4v2-devel
-%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 %{tde_pkg}.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_tdeappdir}/*.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
-%if 0%{?with_akode}
-%{tde_datadir}/services/amarok_aKode-engine.desktop
-%{tde_tdelibdir}/libamarok_aKode-engine.*
-%endif
-
-%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 %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch3 -p1 -b .rhel4
-%endif
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  %{?with_libvisual:-DWITH_LIBVISUAL=ON} \
-  -DWITH_KONQSIDEBAR=ON \
-  %{?with_xine:-DWITH_XINE=ON} \
-  %{?with_yauap:-DWITH_YAUAP=ON} \
-  %{?with_akode:-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} \
-  -DWITH_DAAP=ON \
-  %{?with_mp4v2:-DWITH_MP4V2=ON} \
-  %{?with_inotify:-DWITH_INOTIFY=ON} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%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
-
-# Locales
-%find_lang %{tde_pkg}
-
-# 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" >> amarok.lang
-  fi
-done
-
-
-
-%clean
-%__rm -fr $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok.spec
index a18b8f583..c483cd3ed 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg amarok
 %define tde_prefix /opt/trinity
@@ -133,6 +133,9 @@ BuildRequires:	dbus-qt
 BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
 %endif
 
+# DAAP support
+%define with_daap 0
+
 # IFP support
 #  IFP package is broken under PCLinuxOS.
 %if 0%{?pclinuxos} == 0
@@ -207,17 +210,21 @@ BuildRequires:	%{_lib}inotifytools-devel
 %endif
 
 # XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} >= 5
+%if 0%{?fedora} && 0%{?fedora} <= 31
 %define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xine1.2-devel
+BuildRequires: xine-lib-devel
 %endif
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} <= 7
+#define with_xine 1
 BuildRequires: xine-lib-devel
 %endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define with_xine 1
+BuildRequires: %{_lib}xine1.2-devel
 %endif
+%if 0%{?sle_version} && 0%{?sle_version} <= 150000
+%define with_xine 1
+BuildRequires: libxine-devel
 %endif
 
 # YAUAP support
@@ -285,18 +292,23 @@ Amarok is a multimedia player with:
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/servicetypes/*.desktop
 %{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_confdir}/amarokrc
+%config(noreplace) %{tde_confdir}/amarokrc
 %{tde_datadir}/config.kcfg/*.kcfg
 %{tde_datadir}/services/amarokitpc.protocol
 %{tde_datadir}/services/amaroklastfm.protocol
 %{tde_datadir}/services/amarokpcast.protocol
+%{tde_mandir}/man1/amarok.1*
+%{tde_mandir}/man1/amarokapp.1*
+%{tde_mandir}/man1/amarokcollectionscanner.1*
 # -libs ?  -- Rex
 %{tde_libdir}/libamarok.so.0
 %{tde_libdir}/libamarok.so.0.0.0
 # DAAP
+%if 0%{?with_daap}
 %{tde_bindir}/amarok_daapserver.rb
 %{tde_tdelibdir}/libamarok_daap-mediadevice.*
 %{tde_datadir}/services/amarok_daap-mediadevice.desktop
+%endif
 # Mass-storage
 %{tde_datadir}/services/amarok_massstorage-device.desktop
 %{tde_tdelibdir}/libamarok_massstorage-device.*
@@ -343,8 +355,8 @@ Amarok is a multimedia player with:
 %{tde_tdelibdir}/libamarok_xine-engine.*
 %endif
 ## Gstreamer engine
-#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
+#{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
@@ -358,22 +370,6 @@ Amarok is a multimedia player with:
 
 ##########
 
-%package ruby
-Summary:		%{name} Ruby support
-Group:			Applications/Multimedia
-Requires:		%{name} = %{?epoch:%{epoch}:}%{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
@@ -410,6 +406,7 @@ use any of xmms' visualisation plugins with Amarok.
 %files visualisation
 %defattr(-,root,root,-)
 %{tde_bindir}/amarok_libvisual
+%{tde_mandir}/man1/amarok_libvisual.1*
 
 %endif
 
@@ -431,6 +428,18 @@ if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
          -e "s|Config\.|RbConfig\.|g"
 fi
 
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+%__sed -i "amarok/src/scripts/common/Publisher.py" \
+          "amarok/src/scripts/common/Zeroconf.py" \
+          "amarok/src/scripts/playlist2html/Playlist.py" \
+          "amarok/src/scripts/playlist2html/playlist2html.py" \
+          "amarok/src/scripts/playlist2html/PlaylistServer.py" \
+          "amarok/src/scripts/webcontrol/Playlist.py" \
+          "amarok/src/scripts/webcontrol/RequestHandler.py" \
+          "amarok/src/scripts/webcontrol/WebControl.py" \
+  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+%endif
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -466,7 +475,7 @@ fi
   \
   %{?with_libvisual:-DWITH_LIBVISUAL=ON} \
   -DWITH_KONQSIDEBAR=ON \
-  %{?with_xine:-DWITH_XINE=ON} \
+  %{?with_xine:-DWITH_XINE=ON} %{?!with_xine:-DWITH_XINE=OFF}\
   %{?with_yauap:-DWITH_YAUAP=ON} \
   -DWITH_AKODE=OFF \
   %{?with_gpod:-DWITH_IPOD=ON} \
@@ -474,9 +483,10 @@ fi
   %{?with_njb:-DWITH_NJB=ON} \
   %{?with_mtp:-DWITH_MTP=ON} \
   %{?with_karma:-DWITH_RIOKARMA=ON} \
-  -DWITH_DAAP=ON \
+  %{!?with_daap:-DWITH_DAAP=OFF} \
   %{?with_mp4v2:-DWITH_MP4V2=ON} \
   %{?with_inotify:-DWITH_INOTIFY=ON} \
+  -DWITH_SYSTEM_SQLITE=ON \
   -DBUILD_ALL=ON \
   ..