RPM: various updates for TDE 14.0.8

1 files changed, 17 insertions, 18 deletions

diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec
index 95d8f58fd..2ac8a4c8d 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/amarok/amarok.spec
@@ -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
@@ -290,13 +293,18 @@ Amarok is a multimedia player with:
 %{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.*
@@ -358,22 +366,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 +402,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
 
@@ -432,8 +425,13 @@ if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
 fi
 
 %if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
-%__sed -i "amarok/src/scripts/playlist2html/playlist2html.py" \
+%__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
@@ -481,9 +479,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 \
   ..