Author: cactus Date: Sat Jul 10 21:53:49 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- clementine has problems with stripped libqsqlite.so add bcond to build with
static sqlite3
---- Files affected:
packages/clementine:
clementine.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: packages/clementine/clementine.spec
diff -u packages/clementine/clementine.spec:1.14
packages/clementine/clementine.spec:1.15
--- packages/clementine/clementine.spec:1.14 Thu Jul 8 18:34:03 2010
+++ packages/clementine/clementine.spec Sat Jul 10 23:53:44 2010
@@ -14,6 +14,7 @@
%bcond_with engine_vlc # without vlc engine
%bcond_with engine_qt_phonon # without qt-phonon engine
%bcond_without engine_gstreamer # without gstreamer engine
+%bcond_with static_sqlite # with static sqlite3
Summary: A music player and library organiser
Summary(hu.UTF-8): Egy zenelejátszó és gyűjtemény-kezelő
@@ -57,12 +58,12 @@
BuildRequires: qt4-qmake
BuildRequires: rpmbuild(macros) >= 1.198
BuildRequires: sed >= 4.0
-BuildRequires: sqlite3-devel
+%{!?with_static_sqlite:BuildRequires: sqlite3-devel}
BuildRequires: taglib-devel >= 1.6
BuildRequires: vlc-devel
BuildRequires: xine-lib-devel
Requires(post,postun): desktop-file-utils
-Requires: QtSql-sqlite3
+%{!?with_static_sqlite:Requires: QtSql-sqlite3}
# while we do not link (yet), we use datafiles
Requires: libprojectM
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -87,7 +88,7 @@
# We already don't use these but just to make sure
rm -rf 3rdparty/gmock
-rm -rf 3rdparty/qsqlite
+%{!?with_static_sqlite:rm -rf 3rdparty/qsqlite}
rm -rf 3rdparty/qtsingleapplication
rm -rf 3rdparty/qxt
rm -rf 3rdparty/qtiocompressor
@@ -105,6 +106,7 @@
-DENGINE_LIBVLC_ENABLED=%{?with_engine_vlc:ON}%{!?with_engine_vlc:OFF} \
-DENGINE_LIBXINE_ENABLED=%{?with_engine_xine:ON}%{!?with_engine_xine:OFF} \
-DENGINE_QT_PHONON_ENABLED=%{?with_engine_qt_phonon:ON}%{!?with_engine_qt_phonon:OFF}
\
+ -DSTATIC_SQLITE=%{?with_static_sqlite:ON}%{!?with_static_sqlite:OFF} \
..
%{__make}
@@ -135,6 +137,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2010/07/10 21:53:44 cactus
+- clementine has problems with stripped libqsqlite.so add bcond to build with
static sqlite3
+
Revision 1.14 2010/07/08 16:34:03 glen
- sqlite-devel is definately bogus
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clementine/clementine.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
