]> git.pld-linux.org Git - packages/amarok.git/blobdiff - amarok.spec
projects / packages / amarok.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- TKADV2009-002 security blocker added
[packages/amarok.git] / amarok.spec
diff --git a/amarok.spec b/amarok.spec
index 18365fe0e9fd09b9115c02cc2c4aa64788b5876e..f3a39111dbf0ace1b339052e68642387c41d0ece 100644 (file)
--- a/amarok.spec
+++ b/amarok.spec
@@ -6,8 +6,8 @@
 # - include /usr/bin/amarok_proxy.rb (proxy server for last.fm, but req. ruby)
 # - main package pulls /usr/bin/ruby
 # - monitor http://bugs.kde.org/show_bug.cgi?id=137390 to remove the temporary fix
-# - karma & MFS (see README)
 # - ProjectM (see README)
+# - karma & MFS (see README)
 #
 # Conditional builds:
 %bcond_with    gstreamer       # enable gstreamer (gst10 not stable)
@@ -28,12 +28,12 @@
 Summary:       A KDE audio player
 Summary(pl.UTF-8):     Odtwarzacz audio dla KDE
 Name:          amarok
-Version:       1.4.7
-Release:       4
+Version:       1.4.10
+Release:       7
 License:       GPL
 Group:         X11/Applications/Multimedia
 Source0:       ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: f1299e142da8a69bc3cff5d585e38d43
+# Source0-md5: 3bdbf26181bf5e5925f48968caba7ac2
 Patch0:                %{name}-helixplayer-morearchs.patch
 Patch1:                %{name}-libnjb.patch
 Patch2:                %{name}-smp.patch
@@ -42,7 +42,13 @@ Patch4:              kde-ac260-lt.patch
 Patch5:                kde-common-PLD.patch
 Patch6:                %{name}-gcc4.patch
 Patch7:                %{name}-titleorder.patch
+Patch8:                %{name}-mongrel.patch
+Patch9:                %{name}-libmtp.patch
 URL:           http://amarok.kde.org/
+# Upgrade to 2.0.1.1 required?
+# http://www.trapkit.de/advisories/TKADV2009-002.txt
+# http://amarok.kde.org/de/node/600
+BuildRequires: security(TKADV2009-002)
 BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf
@@ -53,15 +59,15 @@ BuildRequires:      gettext-devel
 BuildRequires: kdebase-devel
 %{?with_akode:BuildRequires:   kdemultimedia-akode}
 BuildRequires: kdemultimedia-devel >= 9:3.1.93
-%{?with_mp3players:BuildRequires:      libgpod-devel >= 0.4.2}
+%{?with_mp3players:BuildRequires:      libgpod-devel >= 0.6.0}
 %{?with_mp3players:BuildRequires:      libifp-devel >= 1.0.0.2}
 BuildRequires: libltdl-devel
-%{?with_mp3players:BuildRequires:      libmtp-devel >= 0.1.1}
+%{?with_mp3players:BuildRequires:      libmtp-devel >= 0.3.0}
 %{?with_mp3players:BuildRequires:      libnjb-devel >= 2.2.4}
 %{?with_pgsql:BuildRequires:           libpqxx-devel}
 BuildRequires: libtunepimp-devel >= 0.5.1-6
 BuildRequires: libvisual-devel >= 0.4.0
-BuildRequires: mpeg4ip-devel >= 1:1.5
+BuildRequires: mpeg4ip-devel >= 1:1.6
 %{?with_mysql:BuildRequires:           mysql-devel}
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
@@ -74,15 +80,15 @@ BuildRequires:      taglib-devel >= 1.4
 %{?with_xine:BuildRequires:    xine-lib-devel >= 1.1.1}
 Requires(post):        /sbin/ldconfig
 Requires:      %{name}-plugin = %{version}-%{release}
-Requires:      kdebase-core >= 9:3.1.93
-Requires:      kdemultimedia-audiocd >= 9:3.1.93
+Requires:      ruby-mongrel
+Suggests:      kdemultimedia(audiocd) >= 9:3.1.93
 Suggests:      libvisual-plugin-actor-JESS
 Suggests:      libvisual-plugin-actor-bumpscope
 Suggests:      libvisual-plugin-actor-corona
 Suggests:      libvisual-plugin-actor-flower
 Suggests:      libvisual-plugin-actor-gdkpixbuf
 Suggests:      libvisual-plugin-actor-gforce
-Suggests:      libvisual-plugin-actor-gstreamer
+%{?with_gstreamer:Suggests:    libvisual-plugin-actor-gstreamer}
 Suggests:      libvisual-plugin-actor-infinite
 Suggests:      libvisual-plugin-actor-jakdaw
 Suggests:      libvisual-plugin-actor-lv_analyzer
@@ -99,8 +105,10 @@ Suggests:   libvisual-plugin-morph-alphablend
 Suggests:      libvisual-plugin-morph-flash
 Suggests:      libvisual-plugin-morph-slide
 Suggests:      libvisual-plugin-morph-tentacle
+Suggests:      python-PyKDE
 Obsoletes:     amarok-arts
 Obsoletes:     amarok-xmms
+Conflicts:     kdelibs-libs < 9:3.5.9
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -114,6 +122,18 @@ A KDE audio player.
 %description -l pl.UTF-8
 Odtwarzacz audio dla KDE.
 
+%package -n konqueror-addon-amarok
+Summary:       Amarok sidebar for Konqueror
+Summary(pl.UTF-8):     Pasek z Amarokiem dla Konquerora
+Group:         X11/Applications/Multimedia
+Requires:      %{name} = %{version}-%{release}
+
+%description -n konqueror-addon-amarok
+Amarok sidebar for Konqueror.
+
+%description -n konqueror-addon-amarok -l pl.UTF-8
+Pasek z Amarokiem dla Konquerora.
+
 %package akode
 Summary:       Plugin akode
 Summary(pl.UTF-8):     Wtyczka akode
@@ -202,7 +222,7 @@ Summary:    amaroK scripts
 Summary(pl.UTF-8):     Skrypty amaroKa
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
-Requires:      kdebase-kdialog
+Requires:      /usr/bin/kdialog
 Requires:      python-PyQt
 Requires:      ruby-modules
 
@@ -228,6 +248,8 @@ Więcej o skryptach w amaroKu można dowiedzieć się stąd:
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p0
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
        amarok/src/amarok.desktop \
@@ -275,6 +297,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
+       ruby_rubylibdir=%{ruby_rubylibdir} \
        kde_htmldir=%{_kdedocdir} \
        kde_libs_htmldir=%{_kdedocdir}
 
@@ -282,7 +305,10 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx
 
 rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/ruby_lib/libhttp11.la
+rm $RPM_BUILD_ROOT%{_libdir}/libamarok.{so,la}
+
+# example plugin code
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/amarok/scripts/templates
 
 [ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
        mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
@@ -302,35 +328,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/amarokapp
 %attr(755,root,root) %{_bindir}/amarokcollectionscanner
 %attr(755,root,root) %{_bindir}/amarok_libvisual
+# used by last.fm and daap
 %attr(755,root,root) %{_bindir}/amarok_proxy.rb
+# used by daap
 %attr(755,root,root) %{_bindir}/amarok_daapserver.rb
-%attr(755,root,root) %{_libdir}/libamarok.so
 %attr(755,root,root) %{_libdir}/libamarok.so.*.*.*
-%attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
+%attr(755,root,root) %ghost %{_libdir}/libamarok.so.0
 %attr(755,root,root) %{_libdir}/kde3/libamarok_generic-mediadevice.so
 %attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so
 %attr(755,root,root) %{_libdir}/kde3/libamarok_daap-mediadevice.so
 %attr(755,root,root) %{_libdir}/kde3/libamarok_massstorage-device.so
 %attr(755,root,root) %{_libdir}/kde3/libamarok_nfs-device.so
 %attr(755,root,root) %{_libdir}/kde3/libamarok_smb-device.so
-%dir %{_libdir}/ruby_lib
-%{_libdir}/ruby_lib/http11.rb
-%attr(755,root,root) %{_libdir}/ruby_lib/libhttp11.so
-%attr(755,root,root) %{_libdir}/ruby_lib/libhttp11.so.0.0.0
 %dir %{_datadir}/apps/amarok
 %dir %{_datadir}/apps/amarok/scripts
-%{_datadir}/apps/amarok/ruby_lib
 %{_datadir}/apps/amarok/*.rc
 %{_datadir}/apps/amarok/data
 %{_datadir}/apps/amarok/icons
 %{_datadir}/apps/amarok/images
 %{_datadir}/apps/amarok/themes
-%{_datadir}/apps/konqueror/servicemenus/amarok_append.desktop
-%{_datadir}/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
-%{_datadir}/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-%{_datadir}/apps/konqsidebartng/add/amarok.desktop
-%{_datadir}/apps/konqsidebartng/entries/amarok.desktop
-%{_datadir}/apps/konqsidebartng/kicker_entries/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/amarok.kcfg
@@ -347,6 +363,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/servicetypes/amarok_plugin.desktop
 %{_desktopdir}/kde/amarok.desktop
 %{_iconsdir}/*/*/apps/amarok.*
+
+# TODO: move to subpackage
+%dir %{ruby_rubylibdir}/amarok
+# used by daap
+%{ruby_rubylibdir}/amarok/codes.rb
+# used by daap and lyrics_lyrc
+%{ruby_rubylibdir}/amarok/debug.rb
+
 # TODO: move to subpackage
 %if %{with mp3players}
 %attr(755,root,root) %{_libdir}/kde3/libamarok_ifp-mediadevice.so
@@ -359,6 +383,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/services/amarok_njb-mediadevice.desktop
 %endif
 
+%files -n konqueror-addon-amarok
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
+%{_datadir}/apps/konqueror/servicemenus/amarok_append.desktop
+%{_datadir}/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
+%{_datadir}/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
+%{_datadir}/apps/konqsidebartng/add/amarok.desktop
+%{_datadir}/apps/konqsidebartng/entries/amarok.desktop
+%{_datadir}/apps/konqsidebartng/kicker_entries/amarok.desktop
+
 %if %{with akode}
 %files akode
 %defattr(644,root,root,755)
@@ -404,11 +438,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/amarok/scripts/common/Publisher.py
 %{_datadir}/apps/amarok/scripts/common/Zeroconf.py
 
-%dir %{_datadir}/apps/amarok/scripts/templates
-%{_datadir}/apps/amarok/scripts/templates/amarok.rb
-%{_datadir}/apps/amarok/scripts/templates/python_qt_template.py
-%{_datadir}/apps/amarok/scripts/templates/ruby_qt_template.rb
-
 # amarok searches for executable programs for scripts
 # to figure out which files need to have execute permission, use this
 # find command:
@@ -423,6 +452,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/amarok/scripts/playlist2html/Playlist.py
 %attr(755,root,root) %{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.py
 %attr(755,root,root) %{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.py
+%{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.spec
+%{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.spec
 
 %dir %{_datadir}/apps/amarok/scripts/webcontrol
 %{_datadir}/apps/amarok/scripts/webcontrol/README
@@ -469,9 +500,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/apps/amarok/scripts/score_impulsive/score_impulsive.rb
 %{_datadir}/apps/amarok/scripts/score_impulsive/score_impulsive.spec
 
-%dir %{_datadir}/apps/amarok/scripts/ruby_debug
-%{_datadir}/apps/amarok/scripts/ruby_debug/debug.rb
-
 %if 0
 %dir %{_datadir}/apps/amarok/scripts/amarok_live
 %{_datadir}/apps/amarok/scripts/amarok_live/README
A KDE audio player
This page took 0.049486 seconds and 4 git commands to generate.