From 1045097fffde64b13378321c01b595d386e9fe0e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Nov 18 2014 20:47:55 +0000 Subject: tomahawk-0.8.1 (#1154274) --- diff --git a/.gitignore b/.gitignore index b54d1a3..10fb713 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /tomahawk-0.6.1.tar.bz2 /tomahawk-0.7.0.tar.bz2 +/tomahawk-0.8.0.tar.bz2 +/tomahawk-0.8.1.tar.bz2 diff --git a/sources b/sources index dc1ebc6..27e0387 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98b7f5bc43e017379f5cd3834f19e90d tomahawk-0.7.0.tar.bz2 +48ad6bafb266ae23946423dc69ca2951 tomahawk-0.8.1.tar.bz2 diff --git a/tomahawk-0.7.0-system-qxt.patch b/tomahawk-0.7.0-system-qxt.patch deleted file mode 100644 index db81b56..0000000 --- a/tomahawk-0.7.0-system-qxt.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up tomahawk-0.7.0/CMakeLists.txt~ tomahawk-0.7.0/CMakeLists.txt ---- tomahawk-0.7.0/CMakeLists.txt~ 2013-05-01 22:26:27.000000000 +0300 -+++ tomahawk-0.7.0/CMakeLists.txt 2014-03-19 21:16:49.670242533 +0200 -@@ -240,8 +240,8 @@ ENDIF( WIN32 ) - - #TODO: support external qxt - set(QXTWEB_FOUND TRUE) --set(QXTWEB_LIBRARIES qxtweb-standalone) --set(QXTWEB_INCLUDE_DIRS ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/web ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/network ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/core ${CMAKE_CURRENT_BINARY_DIR}) -+set(QXTWEB_LIBRARIES QxtWeb) -+set(QXTWEB_INCLUDE_DIRS /usr/include/QxtCore ${CMAKE_CURRENT_BINARY_DIR}) - - ### libportfwd - set(LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include) -diff -up tomahawk-0.7.0/src/TomahawkApp.h~ tomahawk-0.7.0/src/TomahawkApp.h ---- tomahawk-0.7.0/src/TomahawkApp.h~ 2013-05-01 22:26:27.000000000 +0300 -+++ tomahawk-0.7.0/src/TomahawkApp.h 2014-03-19 21:13:15.527701327 +0200 -@@ -32,7 +32,7 @@ - #include "config.h" - - #include --#include -+#include - - #include - #include -diff -up tomahawk-0.7.0/thirdparty/CMakeLists.txt~ tomahawk-0.7.0/thirdparty/CMakeLists.txt ---- tomahawk-0.7.0/thirdparty/CMakeLists.txt~ 2013-05-01 22:26:27.000000000 +0300 -+++ tomahawk-0.7.0/thirdparty/CMakeLists.txt 2014-03-19 20:59:57.105134408 +0200 -@@ -1,4 +1,3 @@ --ADD_SUBDIRECTORY( qxt ) - IF( WITH_BREAKPAD ) - ADD_SUBDIRECTORY( breakpad ) - ENDIF() diff --git a/tomahawk-0.8.0-system_qxt.patch b/tomahawk-0.8.0-system_qxt.patch new file mode 100644 index 0000000..5b57d6f --- /dev/null +++ b/tomahawk-0.8.0-system_qxt.patch @@ -0,0 +1,23 @@ +diff -up tomahawk-0.8.0/CMakeLists.txt.system_qxt tomahawk-0.8.0/CMakeLists.txt +--- tomahawk-0.8.0/CMakeLists.txt.system_qxt 2014-11-04 12:39:38.000000000 -0600 ++++ tomahawk-0.8.0/CMakeLists.txt 2014-11-05 12:44:11.914890190 -0600 +@@ -356,8 +356,8 @@ endif() + endif() + + set(QXTWEB_FOUND TRUE) +-set(QXTWEB_LIBRARIES qxtweb-standalone) +-set(QXTWEB_INCLUDE_DIRS ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/web ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/network ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/core ${CMAKE_CURRENT_BINARY_DIR}) ++set(QXTWEB_LIBRARIES QxtWeb) ++set(QXTWEB_INCLUDE_DIRS /usr/include/QxtCore ${CMAKE_CURRENT_BINARY_DIR}) + + ### libportfwd + set(LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include) +diff -up tomahawk-0.8.0/thirdparty/CMakeLists.txt.system_qxt tomahawk-0.8.0/thirdparty/CMakeLists.txt +--- tomahawk-0.8.0/thirdparty/CMakeLists.txt.system_qxt 2014-11-04 12:39:38.000000000 -0600 ++++ tomahawk-0.8.0/thirdparty/CMakeLists.txt 2014-11-05 12:40:17.008297930 -0600 +@@ -1,4 +1,4 @@ +-ADD_SUBDIRECTORY( qxt ) ++#ADD_SUBDIRECTORY( qxt ) + ADD_SUBDIRECTORY( kdsingleapplicationguard ) + ADD_SUBDIRECTORY( qt-certificate-addon ) + IF( WITH_CRASHREPORTER ) diff --git a/tomahawk.spec b/tomahawk.spec index 5bc244d..e83699f 100644 --- a/tomahawk.spec +++ b/tomahawk.spec @@ -1,36 +1,47 @@ # define to enable features, undef otherwise %ifnarch %{arm} aarch64 -%global breakpad 1 %global crashreporter 1 %endif Name: tomahawk -Version: 0.7.0 -Release: 12%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: The Social Media Player License: GPLv2+ URL: http://tomahawk-player.org/ Source0: http://download.tomahawk-player.org/tomahawk-%{version}%{?pre}.tar.bz2 -Patch0: %{name}-0.7.0-system-qxt.patch BuildRequires: boost-devel BuildRequires: kdelibs4-devel BuildRequires: liblastfm-devel >= 1.0 BuildRequires: pkgconfig(libattica) >= 0.4.0 -BuildRequires: pkgconfig(libechonest) >= 2.0.3 +BuildRequires: pkgconfig(libechonest) >= 2.2 BuildRequires: pkgconfig(libclucene-core) >= 2.3 BuildRequires: pkgconfig(libjreen) >= 1.1.1 +BuildRequires: pkgconfig(liblucene++) +BuildRequires: pkgconfig(libsparsehash) BuildRequires: pkgconfig(phonon) >= 4.5.0 BuildRequires: pkgconfig(qca2) BuildRequires: pkgconfig(QtDBus) pkgconfig(QtGui) pkgconfig(QtNetwork) pkgconfig(QtXmlPatterns) BuildRequires: pkgconfig(QtWebKit) BuildRequires: pkgconfig(QJson) >= 0.8.1 BuildRequires: pkgconfig(taglib) +BuildRequires: pkgconfig(TelepathyQt4) BuildRequires: quazip-devel +BuildRequires: qtkeychain-devel BuildRequires: qtweetlib-devel >= 0.4 -BuildRequires: libqxt-devel +BuildRequires: websocketpp-devel + +#define system_qxt 1 +Patch0: tomahawk-0.8.0-system_qxt.patch +%if 0%{?system_qxt} +# requires post recent qxt additions including qxtsslserver +BuildRequires: libqxt-devel >= 0.7 +%else +Provides: bundled(libqxt) = 0.7 +%endif Requires: %{name}-libs%{?_isa} = %{version}-%{release} %global libechonest_version %(pkg-config --modversion libechonest 2>/dev/null || echo 1.1.7) @@ -69,23 +80,25 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %prep %setup -q -n tomahawk-%{version}%{?pre} -%patch0 -p1 -rm -r thirdparty/qxt + +%if 0%{?system_qxt} +%patch0 -p1 -b .system_qxt +rm -rv thirdparty/qxt +%endif %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} \ +%{cmake_kde4} .. \ -DBUILD_RELEASE:BOOL=ON \ -DBUILD_WITH_QT4:BOOL=ON \ - -DCMAKE_BUILD_TYPE:STRING="Release" \ - -DWITH_BREAKPAD:BOOL=%{?breakpad:ON}%{!?breakpad:OFF} \ - -DWITH_CRASHREPORTER:BOOL=%{?crashreporter:ON}%{!?crashreporter:OFF} \ - .. -popd + -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \ + -DBUILD_HATCHET:BOOL=ON \ + -DWITH_CRASHREPORTER:BOOL=%{?crashreporter:ON}%{!?crashreporter:OFF} -make %{?_smp_mflags} -C %{_target_platform} +make %{?_smp_mflags} +popd %install @@ -93,10 +106,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} #unpackaged files (fixme?) rm -fv %{buildroot}%{_datadir}/icons/hicolor/scalable/tomahawk.svg -%if 0%{?internal_jreen} -rm -rfv %{buildroot}%{_includedir}/jreen/ -rm -fv %{buildroot}%{_libdir}/libjreen.a -%endif %check @@ -121,25 +130,32 @@ fi %doc AUTHORS LICENSE.txt %{_bindir}/tomahawk %{_libdir}/libtomahawk_*.so -%if 0%{?crashreporter:1} -%{_libexecdir}/tomahawk_crash_reporter -%endif +#if 0%{?crashreporter:1} +#{_libexecdir}/tomahawk_crash_reporter +#endif %{_datadir}/applications/tomahawk.desktop -%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/hicolor/*/apps/tomahawk.* %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files libs -%{_libdir}/libtomahawklib.so.%{version} +%{_libdir}/libtomahawk.so.%{version} +%{_libdir}/libtomahawk-playdarapi.so.%{version} +%{_libdir}/libtomahawk-widgets.so.%{version} %files devel %{_includedir}/libtomahawk/ -%{_libdir}/libtomahawklib.so +%{_libdir}/libtomahawk.so +%{_libdir}/libtomahawk-playdarapi.so +%{_libdir}/libtomahawk-widgets.so %{_libdir}/cmake/Tomahawk/ %changelog +* Tue Nov 18 2014 Rex Dieter 0.8.1-1 +- tomahawk-0.8.1 (#1154274) + * Wed Nov 05 2014 Rex Dieter 0.7.0-12 - rebuild (libechonest)