X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=clementine.spec;h=ee7eb875c50298ec3e195af10a7221ce35b666a8;hb=0b056df06de5dbc30691db954eb2b9fb2d57653f;hp=010ea6ac99b4acf5b65d810eee758bd43cf09033;hpb=43a08539c979c8618a83b384988b22a370c8aae3;p=packages%2Fclementine.git

diff --git a/clementine.spec b/clementine.spec
index 010ea6a..ee7eb87 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,29 +1,35 @@
 # TODO:
-# - update patch0
 # - add missing BRs
-# - Gstreamer error: "A text/uri-list decoder plugin is required to play this stream, but not installed." 
+# - Gstreamer error: "A text/uri-list decoder plugin is required to play this stream, but not installed."
+# -- Building engines: gst
+# -- Skipping engines: vlc xine qt-phonon
+#    The following engines are NOT supported by clementine developers:
+#     vlc xine qt-phonon
+# - apply patches to libprojectM.spec and use
+# - make engines pluggable not statically linked, then could enable the bconds
 #
 # Conditional build:
-%bcond_without	engine_xine		# without xine engine
-%bcond_without	engine_vlc		# without vlc engine
-%bcond_without	engine_qt_phonon	# without qt-phonon engine
+%bcond_with		engine_xine		# without xine engine
+%bcond_with		engine_vlc		# without vlc engine
+%bcond_with		engine_qt_phonon	# without qt-phonon engine
 %bcond_without	engine_gstreamer	# without gstreamer engine
-#
+
 Summary:	A music player and library organiser
 Summary(hu.UTF-8):	Egy zenelejátszó és gyűjtemény-kezelő
 Name:		clementine
-Version:	0.4
-Release:	0.1
+Version:	0.4.2
+Release:	0.2
 License:	GPL v3 and GPL v2+
 Group:		Applications/Multimedia
 URL:		http://code.google.com/p/clementine-player
 Source0:	http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	dbfec89142910a60502674234daf01df
+# Source0-md5:	c6819b0d2a8324f1d686fb5a3b1d287b
 Patch0:		%{name}-dont-bundle-external-lib.patch
 Patch2:		desktop-install.patch
 BuildRequires:	QtCore-devel
 BuildRequires:	QtDBus-devel
 BuildRequires:	QtGui-devel
+BuildRequires:	QtIOCompressor-devel
 BuildRequires:	QtNetwork-devel
 BuildRequires:	QtOpenGL-devel
 BuildRequires:	QtSingleApplication-devel
@@ -34,10 +40,14 @@ BuildRequires:	cmake >= 2.6
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-devel
 BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-devel >= 0.10
+BuildRequires:	gstreamer-plugins-base-devel >= 0.10
 BuildRequires:	gtest-devel
 BuildRequires:	liblastfm-devel
 BuildRequires:	libnotify-devel
+#BuildRequires:	libprojectM-devel
 BuildRequires:	libqxt-devel
+#BuildRequires:	libqxt-devel >= 0.6.0-0.2
 BuildRequires:	notification-daemon
 BuildRequires:	phonon-devel
 BuildRequires:	pkgconfig
@@ -48,13 +58,18 @@ BuildRequires:	rpmbuild(macros) >= 1.198
 BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite-devel
 BuildRequires:	sqlite3-devel
-BuildRequires:	taglib-devel
+BuildRequires:	taglib-devel >= 1.6
 BuildRequires:	vlc-devel
 BuildRequires:	xine-lib-devel
 Requires(post,postun):	desktop-file-utils
 Requires:	QtSql-sqlite3
+# while we do not link (yet), we use datafiles
+Requires:	libprojectM
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# see libprojectM.spec for explanation
+%define		filterout_ld	-Wl,--as-needed -Wl,--no-copy-dt-needed-entries
+
 %description
 Clementine is a modern music player and library organiser. It is
 largely a port of Amarok 1.4, with some features rewritten to take
@@ -67,20 +82,25 @@ a Qt4 előnyeit.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch2 -p1
 
 # We already don't use these but just to make sure
-#rm -fr 3rdparty
+rm -rf 3rdparty/gmock
+rm -rf 3rdparty/qsqlite
+rm -rf 3rdparty/qtsingleapplication
+rm -rf 3rdparty/qxt
+rm -rf 3rdparty/qtiocompressor
 
 # Don't build tests. They require gmock
-sed -i -e '/tests/d' CMakeLists.txt
+sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
 
 %build
 install -d build
 cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DBUNDLE_PROJECTM_PRESETS=OFF \
 	-DENGINE_GSTREAMER_ENABLED=%{?with_engine_gstreamer:ON}%{!?with_engine_gstreamer:OFF} \
 	-DENGINE_LIBVLC_ENABLED=%{?with_engine_vlc:ON}%{!?with_engine_vlc:OFF} \
 	-DENGINE_LIBXINE_ENABLED=%{?with_engine_xine:ON}%{!?with_engine_xine:OFF} \