new, version 0.8.4

based on fedora package, 8101ae7

diff --git a/tomahawk-0.8.0-system_qxt.patch b/tomahawk-0.8.0-system_qxt.patch
new file mode 100644 (file)
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-0.8.4-taglib_version.patch b/tomahawk-0.8.4-taglib_version.patch
new file mode 100644 (file)
index 0000000..cb53edb
--- /dev/null
+++ b/tomahawk-0.8.4-taglib_version.patch
@@ -0,0 +1,27 @@
+## upstreamable patch
+# fix FindTaglib.cmake for taglib-1.10+
+diff -up tomahawk-0.8.4/CMakeModules/FindTaglib.cmake.taglib_version tomahawk-0.8.4/CMakeModules/FindTaglib.cmake
+--- tomahawk-0.8.4/CMakeModules/FindTaglib.cmake.taglib_version        2015-04-14 23:41:40.000000000 -0500
++++ tomahawk-0.8.4/CMakeModules/FindTaglib.cmake       2015-08-28 09:02:16.657270763 -0500
+@@ -34,10 +34,10 @@ ELSE()
+ 
+         exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-        if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++        if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+                message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+                set(TAGLIB_FOUND FALSE)
+-        else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++        else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+ 
+                exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -48,7 +48,7 @@ ELSE()
+ #                     message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
+                endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+                string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-        endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++        endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") 
+         mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+       else(TAGLIBCONFIG_EXECUTABLE)

diff --git a/tomahawk.spec b/tomahawk.spec
new file mode 100644 (file)
index 0000000..6774d16
--- /dev/null
+++ b/tomahawk.spec
@@ -0,0 +1,158 @@
+#
+# Conditional build:
+%bcond_without crashreporter           # crashreporter support
+%bcond_without system_qxt              # use system libqxt package
+
+%ifarch %{arm} aarch64
+%undefine      with_crashreporter
+%endif
+
+%global libechonest_version %(pkg-config --modversion libechonest 2>/dev/null || echo 1.1.7)
+%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.0)
+
+Summary:       The Social Media Player
+Name:          tomahawk
+Version:       0.8.4
+Release:       0.1
+License:       GPL v2+
+Group:         X11/Applications/Multimedia
+Source0:       http://download.tomahawk-player.org/%{name}-%{version}.tar.bz2
+# Source0-md5: 04832abe1786edcc55805875b5882445
+Patch50:       %{name}-0.8.4-taglib_version.patch
+Patch0:                %{name}-0.8.0-system_qxt.patch
+URL:           http://tomahawk-player.org/
+BuildRequires: QtDBus-devel
+BuildRequires: QtGui-devel
+BuildRequires: QtNetwork-devel
+BuildRequires: QtWebKit-devel
+BuildRequires: QtXmlPatterns-devel
+BuildRequires: attica-devel >= 0.4.0
+BuildRequires: boost-devel
+BuildRequires: clucene-core-devel >= 2.3
+BuildRequires: gnutls-devel
+BuildRequires: kde4-kdelibs-devel
+BuildRequires: libechonest-devel >= 2.2
+BuildRequires: liblastfm-devel >= 1.0
+BuildRequires: phonon-devel >= 4.5.0
+BuildRequires: pkgconfig(libjreen) >= 1.1.1
+BuildRequires: pkgconfig(liblucene++)
+BuildRequires: qca-devel
+BuildRequires: qjson-devel >= 0.8.1
+BuildRequires: qtkeychain-devel
+BuildRequires: qtweetlib-devel >= 0.4
+BuildRequires: quazip-devel
+BuildRequires: rpmbuild(macros) >= 1.596
+BuildRequires: sparsehash-devel
+BuildRequires: taglib-devel
+BuildRequires: telepathy-qt4-devel
+BuildRequires: websocketpp-devel
+%if %{with system_qxt}
+# requires post recent qxt additions including qxtsslserver
+BuildRequires: libqxt-devel >= 0.7
+%else
+Provides:      bundled(libqxt) = 0.7
+%endif
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      desktop-file-utils
+Requires:      gtk-update-icon-cache
+Requires:      hicolor-icon-theme
+Requires:      libechonest >= %{libechonest_version}
+Requires:      phonon >= %{phonon_version}
+Requires:      qca-cyrus-sasl
+Requires:      qca-ossl
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Stop chasing your music across different machines, services and
+websites. It's time to take the work out of "play". If the song you
+want to listen to is in your local library, it just plays. If the song
+is on a remote machine, it just plays. If the song is on the web, or
+available from your subscription service, it just plays. By
+abstracting a piece of content's metadata from its file location,
+users can easily share playlists, listening history and more. It's
+sort of like Wonka Vision, Tomahawk will reassemble it on the other
+side. OK, maybe that's not a good analogy... but it's just as
+delicious.
+
+%package libs
+Summary:       Runtime libraries for %{name}
+Group:         Libraries
+
+%description libs
+Runtime libraries for %{name}
+
+%package devel
+Summary:       Development files for %{name}
+Requires:      %{name}-libs = %{version}-%{release}
+
+%description devel
+Development files for %{name}
+
+%prep
+%setup -q -n %{name}-%{version}%{?pre}
+
+%if %{with system_qxt}
+%patch0 -p1
+rm -rv thirdparty/qxt
+%endif
+
+%patch50 -p1
+
+%build
+install -d build
+cd build
+%cmake \
+       -DBUILD_RELEASE:BOOL=ON \
+       -DBUILD_WITH_QT4:BOOL=ON \
+       -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
+       -DBUILD_HATCHET:BOOL=ON \
+       -DWITH_CRASHREPORTER:BOOL=%{?with_crashreporter:ON}%{!?with_crashreporter:OFF} \
+       ..
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} -C build install/fast \
+       DESTDIR=$RPM_BUILD_ROOT
+
+# unpackaged files (fixme?)
+rm -v $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/tomahawk.svg
+
+desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/tomahawk.desktop
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%update_desktop_database
+%update_icon_cache hicolor
+
+%postun
+%update_desktop_database
+%update_icon_cache hicolor
+
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS LICENSE.txt
+%attr(755,root,root) %{_bindir}/tomahawk
+%{_libdir}/libtomahawk_*.so
+%{_desktopdir}/tomahawk.desktop
+%{_iconsdir}/hicolor/*/apps/tomahawk.*
+
+%files libs
+%defattr(644,root,root,755)
+%{_libdir}/libtomahawk.so.%{version}
+%{_libdir}/libtomahawk-playdarapi.so.%{version}
+%{_libdir}/libtomahawk-widgets.so.%{version}
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/libtomahawk/
+%{_libdir}/libtomahawk.so
+%{_libdir}/libtomahawk-playdarapi.so
+%{_libdir}/libtomahawk-widgets.so
+%{_libdir}/cmake/Tomahawk/