SPECS (DEVEL): amarok.spec - kill useless BRs - updated BRs and add some ne...

shadzik shadzik at pld-linux.org
Thu Aug 14 11:55:42 CEST 2008


Author: shadzik                      Date: Thu Aug 14 09:55:42 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- kill useless BRs
- updated BRs and add some new
- lots of cleanups
- remove everything that's unimportand
- simplify spec

---- Files affected:
SPECS:
   amarok.spec (1.123.2.21 -> 1.123.2.22) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.123.2.21 SPECS/amarok.spec:1.123.2.22
--- SPECS/amarok.spec:1.123.2.21	Sun Aug 10 17:50:54 2008
+++ SPECS/amarok.spec	Thu Aug 14 11:55:37 2008
@@ -1,30 +1,6 @@
 # $Revision$, $Date$
-# TODO:
-# - postgresql support alongside mysql
-# - NMM audio backend support (fix build - propably some BRs)
-# - make descriptions less useless
-# - track http://websvn.kde.org/trunk/extragear/multimedia/amarok/TODO?rev=470324&r1=470292&r2=470324
-# - 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
-# - ProjectM (see README)
-# - karma & MFS (see README)
-#
-# Conditional builds:
-%bcond_with	gstreamer	# enable gstreamer (gst10 not stable)
-%bcond_without	mas		# disable MAS audio backend
-%bcond_without	xine		# disable xine engine
-%bcond_without	zeroconf	# disable support for zeroconf
-%bcond_without	included_sqlite # don't use included sqlite (VERY BAD IDEA), needs sqlite >= 3.3 otherwise
-%bcond_without	helix		# disable HelixPlayer engine
-%bcond_without	mp3players	# disable iPod and iRiver MP3 players support
-%bcond_with	nmm		# enable NMM audio backend
-%bcond_with	mysql		# enable MySQL support
-%bcond_with	pgsql		# enable PostgreSQL support
-#
-%ifarch i386
-%undefine	with_helix
-%endif
+%define		state	unstable
+%define		qtver	4.4.1
 
 Summary:	A KDE audio player
 Summary(pl.UTF-8):	Odtwarzacz audio dla KDE
@@ -33,48 +9,38 @@
 Release:	1
 License:	GPL
 Group:		X11/Applications/Multimedia
-Source0:	ftp://ftp.kde.org/pub/kde/unstable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.kde.org/pub/kde/%{state}/amarok/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	acf43672687a5f261ce36d668338a4c1
 Patch0:		kde4-kdeextragear-multimedia-NJB.patch
 URL:		http://amarok.kde.org/
-Buildrequires:	QtOpenGL-devel
-BuildRequires:	QtScript-devel
-BuildRequires:	QtUiTools-devel
-BuildRequires:	QtWebKit-devel
-BuildRequires:	QtSvg-devel
-BuildRequires:	SDL-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	dbus-glib-devel
-BuildRequires:	gettext-devel
-%{?with_gstreamer:BuildRequires:	gstreamer-devel >= 0.10.0}
+Buildrequires:	QtOpenGL-devel >= %{qtver}
+BuildRequires:	QtScript-devel >= %{qtver}
+BuildRequires:	QtSvg-devel >= %{qtver}
+BuildRequires:	QtUiTools-devel >= %{qtver}
+BuildRequires:	QtWebKit-devel >= %{qtver}
+BuildRequires:	cmake >= 2.6.0
+BuildRequires:	glib2-devel
 BuildRequires:	kde4-kdebase-devel
 BuildRequires:	kde4-kdemultimedia-devel
-%{?with_mp3players:BuildRequires:	libgpod-devel >= 0.4.2}
-%{?with_mp3players:BuildRequires:	libifp-devel >= 1.0.0.2}
-BuildRequires:	libltdl-devel
-%{?with_mp3players:BuildRequires:	libmtp-devel >= 0.1.1}
-%{?with_mp3players:BuildRequires:	libnjb-devel >= 2.2.4}
-%{?with_pgsql:BuildRequires:		libpqxx-devel}
-BuildRequires:	libtunepimp-devel >= 0.5.1-6
-BuildRequires:	loudmouth-devel
-BuildRequires:  xorg-lib-libXpm-devel
+BuildRequires:	libgpod-devel >= 0.4.2
+BuildRequires:	libifp-devel >= 1.0.0.2
+BuildRequires:	libmtp-devel >= 0.3.0
+BuildRequires:	libnjb-devel >= 2.2.4
 BuildRequires:	libvisual-devel >= 0.4.0
+BuildRequires:	loudmouth-devel
 BuildRequires:	mpeg4ip-devel >= 1:1.6
-%{?with_mysql:BuildRequires:		mysql-devel}
+BuildRequires:	mysql-devel
 BuildRequires:	pcre-devel
 BuildRequires:	pkgconfig
+BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.129
-BuildRequires:	ruby-devel >= 1.8
-BuildRequires:	soprano-devel
-%{!?with_included_sqlite:BuildRequires:	sqlite3-devel >= 3.3}
-BuildRequires:	strigi-devel >= 0.5.5
+BuildRequires:	soprano-devel >= 2.1
+BuildRequires:	strigi-devel >= 0.5.10
 BuildRequires:	taglib-devel
-%{?with_xine:BuildRequires:	xine-lib-devel >= 1.1.1}
+BuildRequires:	xorg-lib-libXpm-devel
 Requires(post):	/sbin/ldconfig
-Requires:	%{name}-plugin = %{version}-%{release}
 Requires:	kde4-kdebase-core
 Requires:	kde4-kdemultimedia-audiocd
 Suggests:	libvisual-plugin-actor-JESS
@@ -112,97 +78,12 @@
 %description -l pl.UTF-8
 Odtwarzacz audio dla KDE.
 
-%package akode
-Summary:	Plugin akode
-Summary(pl.UTF-8):	Wtyczka akode
-Group:		X11/Applications/Multimedia
-Requires:	%{name} = %{version}-%{release}
-Provides:	%{name}-plugin = %{version}-%{release}
-
-%description akode
-Plugin akode.
-
-%description akode -l pl.UTF-8
-Wtyczka akode.
-
-%package helix
-Summary:	Helix/Realplayer playback support for amarok
-Summary(pl.UTF-8):	Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka
-Group:		X11/Applications/Multimedia
-Requires:	%{name} = %{version}-%{release}
-Requires:	helix-core
-Provides:	%{name}-plugin = %{version}-%{release}
-
-%description helix
-Helix/Realplayer playback support for amarok.
-
-%description helix -l pl.UTF-8
-Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka.
-
-%package gstreamer
-Summary:	Plugin gstreamer
-Summary(pl.UTF-8):	Wtyczka gstreamer
-Group:		X11/Applications/Multimedia
-# deps, to get it working:
-# mp3 decoder:	gstreamer-mad
-# ogg decoder:	gstreamer-vorbis
-# audio output driver:	gstreamer-audiosink-alsa
-# from gstreamer-audio-effects to control volume, etc
-# needed libs:
-#  at least /usr/lib/gstreamer-0.8/libgstresample.so
-#  probably /usr/lib/gstreamer-0.8/libgstadder.so
-#  and probably /usr/lib/gstreamer-0.8/libgstvolume.so
-# gstreamer-musicbrainz for being able to edit id3 tags on files.
-Requires:	%{name} = %{version}-%{release}
-Requires:	gstreamer-audio-effects
-Requires:	gstreamer-audiosink
-Requires:	gstreamer-mad
-Requires:	gstreamer-musicbrainz
-Requires:	gstreamer-vorbis
-Provides:	%{name}-plugin = %{version}-%{release}
-
-%description gstreamer
-Plugin gstreamer.
-
-%description gstreamer -l pl.UTF-8
-Wtyczka gstreamer.
-
-%package xine
-Summary:	Plugin xine
-Summary(pl.UTF-8):	Wtyczka xine
-Group:		X11/Applications/Multimedia
-Requires:	%{name} = %{version}-%{release}
-Requires:	xine-plugin-audio
-Provides:	%{name}-plugin = %{version}-%{release}
-
-%description xine
-Plugin xine.
-
-%description xine -l pl.UTF-8
-Wtyczka xine.
-
-%package zeroconf
-Summary:	Zeroconf data
-Summary(pl.UTF-8):	Dane dla zeroconf
-Group:		X11/Applications/Multimedia
-Requires:	%{name} = %{version}-%{release}
-Requires:	kde4-kdenetwork-kdnssd
-Provides:	%{name}-plugin = %{version}-%{release}
-
-%description zeroconf
-Zeroconf data.
-
-%description zeroconf -l pl.UTF-8
-Dane dla zeroconf.
-
 %package scripts
 Summary:	amaroK scripts
 Summary(pl.UTF-8):	Skrypty amaroKa
 Group:		X11/Applications/Multimedia
 Requires:	%{name} = %{version}-%{release}
 Requires:	kde4-kdebase-kdialog
-Requires:	python-PyQt
-Requires:	ruby-modules
 
 %description scripts
 amaroK scripts allow you extend amaroK functionality.
@@ -225,6 +106,7 @@
 cd build
 %cmake \
 		-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+		-DCMAKE_AR=%{_bindir}/ar \
 %if "%{_lib}" == "lib64"
 		-DLIB_SUFFIX=64 \
 %endif
@@ -299,30 +181,17 @@
 %attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_mp3tunes.so
 %attr(755,root,root) %{_libdir}/kde4/libamarok_collection-daapcollection.so
 %attr(755,root,root) %{_libdir}/kde4/libamarok_collection-sqlcollection.so
-#%attr(755,root,root) %{_libdir}/kde4/libamarok_generic-mediadevice.so
-#%attr(755,root,root) %{_libdir}/kde4/libamarok_phonon-engine.so
-#%attr(755,root,root) %{_libdir}/kde4/libamarok_void-engine_plugin.so
 %dir %{_datadir}/apps/amarok
 %dir %{_datadir}/apps/amarok/scripts
 %{_datadir}/apps/amarok/data
 %{_datadir}/apps/amarok/icons
 %{_datadir}/apps/amarok/images
 %{_datadir}/apps/desktoptheme
-#%{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config.kcfg/amarok.kcfg
 %{_datadir}/config/amarok.knsrc
-#%{_datadir}/kde4/services/amarok_generic-mediadevice.desktop
-#%{_datadir}/kde4/services/amarok_void-engine_plugin.desktop
 %{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
-#%{_datadir}/dbus-1/interfaces/org.kde.amarok.collection.xml
-#%{_datadir}/dbus-1/interfaces/org.kde.amarok.context.xml
-#%{_datadir}/dbus-1/interfaces/org.kde.amarok.mediabrowser.xml
-#%{_datadir}/dbus-1/interfaces/org.kde.amarok.player.xml
-#%{_datadir}/dbus-1/interfaces/org.kde.amarok.playlist.xml
-#%{_datadir}/dbus-1/interfaces/org.kde.amarok.playlistbrowser.xml
-#%{_datadir}/dbus-1/interfaces/org.kde.amarok.script.xml
 %{_datadir}/kde4/services/ServiceMenus/amarok_append.desktop
 %{_datadir}/kde4/services/amarok-containment-context.desktop
 %{_datadir}/kde4/services/amarok-context-applet-currenttrack.desktop
@@ -337,7 +206,6 @@
 %{_datadir}/kde4/services/amarok-data-engine-wikipedia.desktop
 %{_datadir}/kde4/services/amarok_collection-daapcollection.desktop
 %{_datadir}/kde4/services/amarok_collection-sqlcollection.desktop
-#%{_datadir}/kde4/services/amarok_phonon-engine.desktop
 %{_datadir}/kde4/services/amarok_service_ampache.desktop
 %{_datadir}/kde4/services/amarok_service_ampache_config.desktop
 %{_datadir}/kde4/services/amarok_service_jamendo.desktop
@@ -361,13 +229,6 @@
 %{_desktopdir}/kde4/amarok.desktop
 %{_iconsdir}/*/*/apps/amarok.*
 
-%if %{with xine}
-%files xine
-%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/kde4/libamarok_xine-engine.so
-#%{_datadir}/config.kcfg/xinecfg.kcfg
-#%{_datadir}/kde4/services/amarok_xine-engine.desktop
-%endif
 %files scripts
 %defattr(644,root,root,755)
 %dir %{_datadir}/apps/amarok/scripts/qtscript_debug
@@ -389,6 +250,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123.2.22  2008/08/14 09:55:37  shadzik
+- kill useless BRs
+- updated BRs and add some new
+- lots of cleanups
+- remove everything that's unimportand
+- simplify spec
+
 Revision 1.123.2.21  2008/08/10 15:50:54  zergin
 - Added missing BRs: loudmouth-devel, xorg-lib-libXpm-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amarok.spec?r1=1.123.2.21&r2=1.123.2.22&f=u



More information about the pld-cvs-commit mailing list