- up to 0.5, builds

Changed files:
    clementine-dont-bundle-external-lib.patch -> 1.3
    clementine.spec -> 1.18
    no-private_header.patch -> 1.1

diff --git a/clementine-dont-bundle-external-lib.patch b/clementine-dont-bundle-external-lib.patch
deleted file mode 100644 (file)
index 947004e..0000000
--- a/clementine-dont-bundle-external-lib.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- clementine-0.4.2/CMakeLists.txt~   2010-07-01 21:18:22.000000000 +0300
-+++ clementine-0.4.2/CMakeLists.txt    2010-07-07 09:03:25.664272595 +0300
-@@ -149,12 +149,7 @@
- endif(STATIC_SQLITE)
- 
- # Subdirectories
--add_subdirectory(3rdparty/qtsingleapplication)
--add_subdirectory(3rdparty/qtiocompressor)
- add_subdirectory(src)
--if (NOT APPLE)
--  add_subdirectory(3rdparty/qxt)
--endif (NOT APPLE)
- add_subdirectory(3rdparty/universalchardet)
- add_subdirectory(tests)
- add_subdirectory(dist)
---- clementine-0.4.2/src/CMakeLists.txt~       2010-07-01 21:17:36.000000000 +0300
-+++ clementine-0.4.2/src/CMakeLists.txt        2010-07-07 08:33:17.521870705 +0300
-@@ -5,10 +5,9 @@
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
- include_directories(${SPARKLE})
--include_directories(../3rdparty/gmock/gtest/include)
--include_directories(../3rdparty/qtsingleapplication)
--include_directories(../3rdparty/qtiocompressor)
--include_directories(../3rdparty/qxt)
-+include_directories("/usr/include/QtSolutions")
-+include_directories("/usr/include/QxtGui")
-+include_directories("/usr/include/QxtCore")
- include_directories(../3rdparty/libprojectm)
- 
- include_directories(${GLIB_INCLUDE_DIRECTORIES})
-@@ -449,8 +448,8 @@
- add_dependencies(clementine_lib pot)
- 
- target_link_libraries(clementine_lib
--  qtsingleapplication
--  qtiocompressor
-+  QtSolutions_SingleApplication-2.6
-+  QtSolutions_IOCompressor-2.3
-   chardet
-   ${GOBJECT_LIBRARIES}
-   ${GLIB_LIBRARIES}
-@@ -475,7 +474,7 @@
-   )
-   include_directories(${SPARKLE}/Headers)
- else (APPLE)
--  target_link_libraries(clementine_lib qxt)
-+  target_link_libraries(clementine_lib QxtCore QxtGui)
- endif (APPLE)
- 
- # Link against the qsqlite plugin on windows and mac
-@@ -484,7 +483,7 @@
-   target_link_libraries(clementine_lib qsqlite)
- endif(HAVE_STATIC_SQLITE)
- 
--add_dependencies(clementine_lib qtsingleapplication)
-+add_dependencies(clementine_lib QtSolutions_SingleApplication-2.6)
- 
- 
- ###############################################################################

diff --git a/clementine.spec b/clementine.spec
index 1414c34ada7a49fe45d209979862980f289d3a57..4599bef583cb67e586e7c00db1cf8d61af586790 100644 (file)
--- a/clementine.spec
+++ b/clementine.spec
@@ -19,36 +19,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
@@ -57,7 +57,7 @@ BuildRequires:        pkgconfig
 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
@@ -85,7 +85,7 @@ a Qt4 előnyeit.
 %prep
 %setup -q
 %patch0 -p1
-%patch2 -p1
+%patch1 -p1
 
 # We already don't use these but just to make sure
 rm -rf 3rdparty/gmock
@@ -102,8 +102,10 @@ sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
 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} \
@@ -117,6 +119,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__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
 

diff --git a/no-private_header.patch b/no-private_header.patch
new file mode 100644 (file)
index 0000000..e9b2e93
--- /dev/null
+++ b/no-private_header.patch
@@ -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"
+