packages: clementine/clementine.spec, clementine/no-private_header.patch (N...

[glen]

Author: glen                         Date: Mon Sep  6 13:54:41 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.5, builds

---- Files affected:
packages/clementine:
   clementine.spec (1.17 -> 1.18) , no-private_header.patch (NONE -> 1.1)  (NEW), clementine-dont-bundle-external-lib.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/clementine/clementine.spec
diff -u packages/clementine/clementine.spec:1.17 packages/clementine/clementine.spec:1.18
--- packages/clementine/clementine.spec:1.17	Sun Jul 25 21:14:25 2010
+++ packages/clementine/clementine.spec	Mon Sep  6 15:54:36 2010
@@ -20,36 +20,36 @@
 Summary:	A music player and library organiser
 Summary(hu.UTF-8):	Egy zenelejátszó és gyűjtemény-kezelő
 Name:		clementine
-Version:	0.4.2
-Release:	0.2
+Version:	0.5
+Release:	0.1
 License:	GPL v3 and GPL v2+
 Group:		Applications/Multimedia
-URL:		http://code.google.com/p/clementine-player
+URL:		http://www.clementine-player.org/
 Source0:	http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	c6819b0d2a8324f1d686fb5a3b1d287b
-Patch0:		%{name}-dont-bundle-external-lib.patch
-Patch2:		desktop-install.patch
+# Source0-md5:	59a94906394c7e22da567841770dab86
+Patch0:		desktop-install.patch
+Patch1:		no-private_header.patch
 BuildRequires:	QtCore-devel
 BuildRequires:	QtDBus-devel
 BuildRequires:	QtGui-devel
 BuildRequires:	QtIOCompressor-devel
 BuildRequires:	QtNetwork-devel
 BuildRequires:	QtOpenGL-devel
-BuildRequires:	QtSingleApplication-devel
+BuildRequires:	QtSingleApplication-devel >= 2.6-3
 BuildRequires:	QtSql-devel
 %{?with_tests:BuildRequires:	QtTest-devel}
 BuildRequires:	boost-devel
 BuildRequires:	cmake >= 2.6
 #BuildRequires:	desktop-file-utils
+#%{?with_static_projectm:BuildRequires:	ftgl-devel >= 2.1.3}
 BuildRequires:	gettext-devel
+%{?with_static_projectm:BuildRequires:	glew-devel}
 %{?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
-%{!?with_static_projectm:BuildRequires:	libprojectM-devel}
-%{?with_static_projectm:BuildRequires:	glew-devel}
-#%{?with_static_projectm:BuildRequires:  ftgl-devel >= 2.1.3}
+%{!?with_static_projectm:BuildRequires:	libprojectM-devel >= 1:2.0.1-4}
 BuildRequires:	libqxt-devel
 #BuildRequires:	libqxt-devel >= 0.6.0-0.2
 BuildRequires:	notification-daemon
@@ -58,7 +58,7 @@
 BuildRequires:	qt4-build
 BuildRequires:	qt4-linguist
 BuildRequires:	qt4-qmake
-BuildRequires:	rpmbuild(macros) >= 1.198
+BuildRequires:	rpmbuild(macros) >= 1.577
 BuildRequires:	sed >= 4.0
 %{!?with_static_sqlite:BuildRequires:	sqlite3-devel}
 BuildRequires:	taglib-devel >= 1.6
@@ -86,7 +86,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch2 -p1
+%patch1 -p1
 
 # We already don't use these but just to make sure
 rm -rf 3rdparty/gmock
@@ -103,8 +103,10 @@
 install -d build
 cd build
 %cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DBUNDLE_PROJECTM_PRESETS=OFF \
+	-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON \
+	-DUSE_SYSTEM_QXT=ON \
+	-DUSE_SYSTEM_PROJECTM=ON \
 	-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} \
@@ -118,6 +120,8 @@
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/application-x-clementine.svg
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -140,6 +144,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2010/09/06 13:54:36  glen
+- up to 0.5, builds
+
 Revision 1.17  2010/07/25 19:14:25  glen
 - tune defaults to ones that work
 

================================================================
Index: packages/clementine/no-private_header.patch
diff -u /dev/null packages/clementine/no-private_header.patch:1.1
--- /dev/null	Mon Sep  6 15:54:41 2010
+++ packages/clementine/no-private_header.patch	Mon Sep  6 15:54:36 2010
@@ -0,0 +1,10 @@
+--- clementine-0.5/src/main.cpp~	2010-08-29 15:34:07.000000000 +0300
++++ clementine-0.5/src/main.cpp	2010-09-06 16:39:29.482708643 +0300
+@@ -35,7 +35,6 @@
+ #include "ui/iconloader.h"
+ #include "ui/mainwindow.h"
+ 
+-#include "qtlocalpeer.h"
+ #include "qtsingleapplication.h"
+ #include "qtsinglecoreapplication.h"
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clementine/clementine.spec?r1=1.17&r2=1.18&f=u