Author: glen Date: Tue Jul 13 07:56:50 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- static projectm bcond, bcond other br
---- Files affected:
packages/clementine:
clementine.spec (1.15 -> 1.16)
---- Diffs:
================================================================
Index: packages/clementine/clementine.spec
diff -u packages/clementine/clementine.spec:1.15
packages/clementine/clementine.spec:1.16
--- packages/clementine/clementine.spec:1.15 Sat Jul 10 23:53:44 2010
+++ packages/clementine/clementine.spec Tue Jul 13 09:56:45 2010
@@ -15,6 +15,7 @@
%bcond_with engine_qt_phonon # without qt-phonon engine
%bcond_without engine_gstreamer # without gstreamer engine
%bcond_with static_sqlite # with static sqlite3
+%bcond_with static_projectm # with static projectM
Summary: A music player and library organiser
Summary(hu.UTF-8): Egy zenelejátszó és gyűjtemény-kezelő
@@ -36,22 +37,23 @@
BuildRequires: QtOpenGL-devel
BuildRequires: QtSingleApplication-devel
BuildRequires: QtSql-devel
-BuildRequires: QtTest-devel
+%{?with_tests:BuildRequires: QtTest-devel}
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6
-BuildRequires: desktop-file-utils
+#BuildRequires: desktop-file-utils
BuildRequires: gettext-devel
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-devel >= 0.10
-BuildRequires: gstreamer-plugins-base-devel >= 0.10
+%{?with_engine_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
+%{?with_engine_gstreamer:BuildRequires: gstreamer-plugins-base-devel >=
0.10}
BuildRequires: gtest-devel
BuildRequires: liblastfm-devel
BuildRequires: libnotify-devel
-#BuildRequires: libprojectM-devel
+%{!?with_static_projectm:BuildRequires: libprojectM-devel}
+%{?with_static_projectm:BuildRequires: glew-devel}
+#%{?with_static_projectm:BuildRequires: ftgl-devel >= 2.1.3}
BuildRequires: libqxt-devel
#BuildRequires: libqxt-devel >= 0.6.0-0.2
BuildRequires: notification-daemon
-BuildRequires: phonon-devel
+%{?with_engine_phonon:BuildRequires: phonon-devel}
BuildRequires: pkgconfig
BuildRequires: qt4-build
BuildRequires: qt4-linguist
@@ -60,8 +62,8 @@
BuildRequires: sed >= 4.0
%{!?with_static_sqlite:BuildRequires: sqlite3-devel}
BuildRequires: taglib-devel >= 1.6
-BuildRequires: vlc-devel
-BuildRequires: xine-lib-devel
+%{?with_engine_vlc:BuildRequires: vlc-devel}
+%{?with_engine_xine:BuildRequires: xine-lib-devel}
Requires(post,postun): desktop-file-utils
%{!?with_static_sqlite:Requires: QtSql-sqlite3}
# while we do not link (yet), we use datafiles
@@ -92,6 +94,7 @@
rm -rf 3rdparty/qtsingleapplication
rm -rf 3rdparty/qxt
rm -rf 3rdparty/qtiocompressor
+%{!?with_static_projectm:rm -rf 3rdparty/libprojectM}
# Don't build tests. They require gmock
sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
@@ -137,6 +140,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2010/07/13 07:56:45 glen
+- static projectm bcond, bcond other br
+
Revision 1.15 2010/07/10 21:53:44 cactus
- clementine has problems with stripped libqsqlite.so add bcond to build with
static sqlite3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clementine/clementine.spec?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
