commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2018-06-22 13:30:34 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is "tomahawk" Fri Jun 22 13:30:34 2018 rev:30 rq:615246 version:0.8.99~git20180422T140543 Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2017-12-29 00:02:52.893403218 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2018-06-22 13:30:40.785082159 +0200 @@ -1,0 +2,10 @@ +Fri Jun 8 11:20:16 UTC 2018 - wba...@tmo.at + +- Update to latest git master (34c1f88): + * Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) +- Mark license file with %license instead of %doc +- Drop useless libqjson-devel build requirement to avoid pulling in + Qt4, explicitly BuildRequire openssl-devel that got pulled in + indirectly to make it build + +--- Old: tomahawk-0.8.99~git20170808T143449.obscpio New: tomahawk-0.8.99~git20180422T140543.obscpio Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.Bm2HTU/_old 2018-06-22 13:30:44.632939936 +0200 +++ /var/tmp/diff_new_pack.Bm2HTU/_new 2018-06-22 13:30:44.676938310 +0200 @@ -1,7 +1,7 @@ # # spec file for package tomahawk # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominik Schmidt # # All modifications and additions to the file contributed by third parties @@ -27,7 +27,7 @@ Summary:The social media player License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -Version:0.8.99~git20170808T143449 +Version:0.8.99~git20180422T140543 Release:0 Source: tomahawk-%{version}.tar.xz Source2:tomahawk.SuSEfirewall2 @@ -54,8 +54,8 @@ BuildRequires: libgnutls-devel BuildRequires: liblastfm-qt5-devel >= 1.0.1 BuildRequires: libqca-qt5-devel -BuildRequires: libqjson-devel BuildRequires: lucene++-devel +BuildRequires: openssl-devel BuildRequires: qtkeychain-qt5-devel BuildRequires: quazip-qt5-devel BuildRequires: sparsehash-devel @@ -214,7 +214,8 @@ %files %defattr(-,root,root,0755) -%doc LICENSE.txt README.md ChangeLog AUTHORS +%license LICENSE.txt +%doc README.md ChangeLog AUTHORS %{_bindir}/tomahawk %ifnarch %arm ppc ppc64 ppc64le ++ tomahawk-0.8.99~git20170808T143449.obscpio -> tomahawk-0.8.99~git20180422T140543.obscpio ++ /work/SRC/openSUSE:Factory/tomahawk/tomahawk-0.8.99~git20170808T143449.obscpio /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk-0.8.99~git20180422T140543.obscpio differ: char 9, line 1 ++ tomahawk.obsinfo ++ --- /var/tmp/diff_new_pack.Bm2HTU/_old 2018-06-22 13:30:45.752898541 +0200 +++ /var/tmp/diff_new_pack.Bm2HTU/_new 2018-06-22 13:30:45.776897654 +0200 @@ -1,5 +1,5 @@ name: tomahawk -version: 0.8.99~git20170808T143449 -mtime: 1502195689 -commit: 00f602e10203b76fc28b4615868c567e6bd4ced4 +version: 0.8.99~git20180422T140543 +mtime: 1524398743 +commit: 34c1f88171f00a3e9fae57250799f3d3623b5f74
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2017-12-29 00:02:46 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is "tomahawk" Fri Dec 29 00:02:46 2017 rev:29 rq:556616 version:0.8.99~git20170808T143449 Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2017-02-03 20:03:43.738003505 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2017-12-29 00:02:52.893403218 +0100 @@ -1,0 +2,11 @@ +Sun Dec 10 07:22:53 UTC 2017 - fab...@ritter-vogt.de + +- Update to git master (00f602e) +- Switch to Qt 5 +- Remove patch, now upstream: + * fix-taglib-detection.diff +- Drop libtomahawk-plugins-telepathy-kde, not included anymore +- Add patch to fix warning which rpmlint does not like: + * 0001-Fix-control-reaches-end-of-non-void-function-in-Dele.patch + +--- Old: fix-taglib-detection.diff tomahawk-0.8.4.tar.bz2 New: 0001-Fix-control-reaches-end-of-non-void-function-in-Dele.patch _service tomahawk-0.8.99~git20170808T143449.obscpio tomahawk.obsinfo Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.u3Kh4q/_old 2017-12-29 00:02:53.989089153 +0100 +++ /var/tmp/diff_new_pack.u3Kh4q/_new 2017-12-29 00:02:53.993088006 +0100 @@ -19,7 +19,7 @@ %define _tomahawk_major_version 0 %define _tomahawk_minor_version 8 -%define _tomahawk_patch_version 4 +%define _tomahawk_patch_version 99 %define _libtomahawk_soversion %{_tomahawk_major_version}_%{_tomahawk_minor_version}_%{_tomahawk_patch_version} @@ -27,19 +27,18 @@ Summary:The social media player License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -Version: %{_tomahawk_major_version}.%{_tomahawk_minor_version}.%{_tomahawk_patch_version} +Version:0.8.99~git20170808T143449 Release:0 -Source: tomahawk-%{version}.tar.bz2 +Source: tomahawk-%{version}.tar.xz Source2:tomahawk.SuSEfirewall2 Source3:Tomahawk.khotkeys Source99: tomahawk-rpmlintrc -# PATCH-FIX-UPSTREAM fix-taglib-detection.diff -- Use VERSION_LESS to compare versions -Patch0: fix-taglib-detection.diff +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-control-reaches-end-of-non-void-function-in-Dele.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://gettomahawk.com -Requires: libqt4-sql-sqlite +Requires: libQt5Sql5-sqlite BuildRequires: cmake BuildRequires: gcc-c++ @@ -50,39 +49,38 @@ %else BuildRequires: boost-devel %endif -BuildRequires: libQtWebKit-devel -BuildRequires: libattica-devel >= 0.4.0 -BuildRequires: libechonest-devel >= 2.3.0 +BuildRequires: attica-qt5-devel >= 0.4.0 +BuildRequires: libechonest-qt5-devel >= 2.3.0 BuildRequires: libgnutls-devel -BuildRequires: libkde4-devel -BuildRequires: liblastfm-devel >= 1.0.1 -BuildRequires: libqca2-devel +BuildRequires: liblastfm-qt5-devel >= 1.0.1 +BuildRequires: libqca-qt5-devel BuildRequires: libqjson-devel -BuildRequires: libqt4-devel >= 4.7.0 BuildRequires: lucene++-devel -BuildRequires: qtkeychain-devel -BuildRequires: quazip-devel +BuildRequires: qtkeychain-qt5-devel +BuildRequires: quazip-qt5-devel BuildRequires: sparsehash-devel BuildRequires: sqlite3-devel >= 3.6.22 BuildRequires: taglib-devel >= 1.6.2 -BuildRequires: telepathy-qt4-devel +BuildRequires: telepathy-qt5-devel +BuildRequires: vlc-devel BuildRequires: websocketpp-devel +BuildRequires: cmake(Qt5Concurrent) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5UiTools) +BuildRequires: cmake(Qt5WebKitWidgets) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5X11Extras) +BuildRequires: cmake(Qt5Xml) # Audio stuff -BuildRequires: phonon-devel >= 4.5.0 -Requires: libphonon4 >= 4.5.0 -Conflicts: phonon-backend-vlc < 0.4 -Conflicts: phonon-backend-gstreamer < 4.5.0 -Conflicts: phonon-backend-xine -Recommends: phonon-backend-gstreamer >= 4.5.0 -Recommends: phonon-backend-vlc >= 0.4 +BuildRequires: phonon4qt5-devel +Recommends: phonon4qt5-backend-gstreamer +Recommends: phonon4qt5-backend-vlc # Optional deps for additional features -BuildRequires: libjreen-devel >= 1.0.1 -BuildRequires: libqtweetlib-devel - -# KDE integration -BuildRequires: kde4-filesystem +BuildRequires: libjreen-qt5-devel # Other BuildRequires: hicolor-icon-theme @@ -95,7 +93,7 @@ Summary:KDE integration for Tomahawk Group:
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2017-02-03 16:30:14 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is "tomahawk" Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2016-02-16 09:18:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2017-02-03 20:03:43.738003505 +0100 @@ -1,0 +2,5 @@ +Thu Feb 2 15:11:17 UTC 2017 - adam.ma...@suse.de + +- use individual libboost-*-devel packages instead of boost-devel + +--- Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.ZLcNCH/_old 2017-02-03 20:03:44.521893169 +0100 +++ /var/tmp/diff_new_pack.ZLcNCH/_new 2017-02-03 20:03:44.521893169 +0100 @@ -1,7 +1,7 @@ # # spec file for package tomahawk # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominik Schmidt # # All modifications and additions to the file contributed by third parties @@ -45,7 +45,11 @@ BuildRequires: gcc-c++ # Required deps -BuildRequires: boost-devel >= 1.3 +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_filesystem-devel +%else +BuildRequires: boost-devel +%endif BuildRequires: libQtWebKit-devel BuildRequires: libattica-devel >= 0.4.0 BuildRequires: libechonest-devel >= 2.3.0
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2016-02-16 09:18:33 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is "tomahawk" Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2015-04-15 16:25:03.0 +0200 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2016-02-16 09:18:35.0 +0100 @@ -1,0 +2,5 @@ +Thu Feb 11 22:36:02 UTC 2016 - cgiboude...@gmx.com + +- Add fix-taglib-detection.diff. Use VERSION_LESS to compare versions. + +--- New: fix-taglib-detection.diff Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.WaRCHM/_old 2016-02-16 09:18:36.0 +0100 +++ /var/tmp/diff_new_pack.WaRCHM/_new 2016-02-16 09:18:36.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package tomahawk # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominik Schmidt # # All modifications and additions to the file contributed by third parties @@ -33,6 +33,8 @@ Source2:tomahawk.SuSEfirewall2 Source3:Tomahawk.khotkeys Source99: tomahawk-rpmlintrc +# PATCH-FIX-UPSTREAM fix-taglib-detection.diff -- Use VERSION_LESS to compare versions +Patch0: fix-taglib-detection.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://gettomahawk.com @@ -155,6 +157,7 @@ %prep %setup -q -n tomahawk-%{version} +%patch0 -p1 %build cmake . \ ++ fix-taglib-detection.diff ++ diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake index e0efbef..01aa947 100644 --- a/CMakeModules/FindTaglib.cmake +++ b/CMakeModules/FindTaglib.cmake @@ -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() 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() mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) else(TAGLIBCONFIG_EXECUTABLE)
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2014-11-24 11:08:54 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2014-11-18 22:49:08.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2014-11-24 11:09:05.0 +0100 @@ -1,0 +2,7 @@ +Thu Nov 20 16:54:02 UTC 2014 - d...@dominik-schmidt.de + +- Update to 0.8.2 + * Show error message if saving tags failed (instead of crashing) + * Fixed painting issue on search page. + +--- Old: tomahawk-0.8.1.tar.bz2 New: tomahawk-0.8.2.tar.bz2 Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.GnEW5R/_old 2014-11-24 11:09:06.0 +0100 +++ /var/tmp/diff_new_pack.GnEW5R/_new 2014-11-24 11:09:06.0 +0100 @@ -19,7 +19,7 @@ %define _tomahawk_major_version 0 %define _tomahawk_minor_version 8 -%define _tomahawk_patch_version 1 +%define _tomahawk_patch_version 2 %define _libtomahawk_soversion %{_tomahawk_major_version}_%{_tomahawk_minor_version}_%{_tomahawk_patch_version} ++ tomahawk-0.8.1.tar.bz2 - tomahawk-0.8.2.tar.bz2 ++ /work/SRC/openSUSE:Factory/tomahawk/tomahawk-0.8.1.tar.bz2 /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk-0.8.2.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2014-11-18 22:47:13 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2014-11-12 00:21:55.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2014-11-18 22:49:08.0 +0100 @@ -1,0 +2,15 @@ +Mon Nov 17 13:08:00 UTC 2014 - d...@dominik-schmidt.de + +- Update to 0.8.1: + * Disabled sorting for stations. + * Fixed drag drop behavior in combination with certain resolvers. + * Fixed infinite scanning recursion. + * Prevented adding dupes to the collection when scanning. + * When playing an artist or album, don't give up when the first track +in list isn't playable. + * Fixed importing M3U playlists. + * Sort album grids by artist name. + * Fixed painting issue on 'More Albums' grid. + * Fixed crash when editing/saving track tags. + +--- Old: tomahawk-0.8.0.tar.bz2 New: tomahawk-0.8.1.tar.bz2 Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.SF5QjE/_old 2014-11-18 22:49:09.0 +0100 +++ /var/tmp/diff_new_pack.SF5QjE/_new 2014-11-18 22:49:09.0 +0100 @@ -19,7 +19,7 @@ %define _tomahawk_major_version 0 %define _tomahawk_minor_version 8 -%define _tomahawk_patch_version 0 +%define _tomahawk_patch_version 1 %define _libtomahawk_soversion %{_tomahawk_major_version}_%{_tomahawk_minor_version}_%{_tomahawk_patch_version} ++ tomahawk-0.8.0.tar.bz2 - tomahawk-0.8.1.tar.bz2 ++ /work/SRC/openSUSE:Factory/tomahawk/tomahawk-0.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk-0.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2014-11-12 00:21:26 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2014-08-03 15:37:05.0 +0200 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2014-11-12 00:21:55.0 +0100 @@ -1,0 +2,70 @@ +Tue Nov 4 20:50:17 UTC 2014 - d...@dominik-schmidt.de + +- Update to 0.8.0: + * Redesigned - Shiny new interface. Simplified. New icons. + * Added Friend Feed. + * Many actions now available in context menu - including Favorite +and Send to a Friend. + * Drag and drop support for iTunes, Deezer, Beats Music, Rdio, +Spotify, SoundCloud links (into Tomahawk) for playlists/tracks/ +artists/album links. + * Support for clicking source icon for currently playing track in +audio controls to take user to associated page on source's site + * Added Hatchet plug-in. + * Added Google Play Music and Beats Music support. + * Add links to Support site, Bug Reports and Translations to Help menu. + * Add What's New page to display on first launch +(or until user dismisses it) - also available from Help menu. + * Changed label from Resolvers and Services to more generic Plug-Ins. + * Clarified some labels, help text and status messages. + * Changed icon color a bit. + * Added Acoustic and Electric songtypes to Stations options. + * Removed some stale Chart sources. + * Playback Queue now saves its state across sessions. + * Queue now moved to sidebar. + * Added Inbox feature, showing incoming song recommendations. Dropping + a track on a user in the sidebar sends a recommendation to them. + * You will now be asked whether you want to trust invalid SSL certificates. + * Improved connecting between Tomahawk peers and support having multiple IPs + (including IPv6). + * Removed Top Loved from sidebar. + * Removed Spotify playlist syncing (we will bring it back in future versions). + * HTTP(S) streaming is now done by Tomahawk instead of the Phonon backend + (fixed HTTPS streaming on MacOS). + * Heavily reduced memory footprint during and after indexing the database. + * Retina display and DPI scaling fixes. + * New Collection views. Re-added support for tracklist view of Collection. + * Added Telepathy support. + * Plugin refactoring (and .AXE resolver binaries). + * Removed Twitter due to change in Twitter's API. + * Removed auto-playlists. + * Improved error messages. + * Added basic remote control API. + * Add support for Opus codec (requires TagLib 1.9). + * Support rtmp:// streams. + * Support custom headers in CustomUrlHandler. + * Fuzzy search indices for JS Resolvers. + * Add metadata retrieval of HTTP(S) streams in JavaScript resolvers. + +- Create subpackages for telepathy (config) plugins, to not pull in the + whole (kde) telepathy stacks. +- Put libtomahawk-playdarapi and libtomahawk-widgets in their own packages +- Update desktop database and icon theme cache on application + (un)installation (instead of library) +- Not building/packaging the crash reporter right now because we + can't upload debug symbols from the OBS +- Updated dependencies: + * clucene was replaced by lucene++ + * require qtkeychain to store passwords in gnome keyring or kwallet + * require sparsehash to store certain cloud files partially in memory + * require websocketpp for hatchet plugin + * require telepathy-qt4 for the optional telepathy integration + * require kde for the optional kde configuration for the telepathy +integration +- Rename _libtomahawk_soname variable to _libtomahawk_soversion in + spec file +- Remove tomahawk-nobreakpad.patch because it was upstreamed +- Remove tomahawk-0.7.0-build-portfwd-statically-and-rename-libtomahawklib-to-libtomahawk.diff: + Patch was taken from upstream and is part of this release + +--- Old: tomahawk-0.7.0-build-portfwd-statically-and-rename-libtomahawklib-to-libtomahawk.diff tomahawk-0.7.0.tar.bz2 tomahawk-nobreakpad.patch New: tomahawk-0.8.0.tar.bz2 Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.3U3EN4/_old 2014-11-12 00:21:56.0 +0100 +++ /var/tmp/diff_new_pack.3U3EN4/_new 2014-11-12 00:21:56.0 +0100 @@ -18,10 +18,10 @@ %define _tomahawk_major_version 0 -%define _tomahawk_minor_version 7 +%define _tomahawk_minor_version 8 %define _tomahawk_patch_version 0 -%define _libtomahawk_soname
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2014-08-03 15:36:59 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2013-12-19 12:38:05.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2014-08-03 15:37:05.0 +0200 @@ -1,0 +2,5 @@ +Fri Aug 1 21:35:58 UTC 2014 - dvla...@suse.com + +- Disable breakpad and crashreported on ppc64le as well + +--- Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.QGDn54/_old 2014-08-03 15:37:06.0 +0200 +++ /var/tmp/diff_new_pack.QGDn54/_new 2014-08-03 15:37:06.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package tomahawk # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominik Schmidt # # All modifications and additions to the file contributed by third parties @@ -135,7 +135,7 @@ -DCMAKE_INSTALL_LIBEXECDIR=lib \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -%ifarch %arm ppc ppc64 +%ifarch %arm ppc ppc64 ppc64le -DWITH_CRASHREPORTER=OFF \ -DWITH_BREAKPAD=OFF \ %endif @@ -176,7 +176,7 @@ %doc LICENSE.txt README.md ChangeLog AUTHORS %{_bindir}/tomahawk -%ifnarch %arm ppc ppc64 +%ifnarch %arm ppc ppc64 ppc64le %{_libexecdir}/tomahawk_crash_reporter %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2013-12-19 12:38:03 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2013-06-17 10:26:27.0 +0200 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2013-12-19 12:38:05.0 +0100 @@ -1,0 +2,7 @@ +Wed Dec 18 10:01:44 UTC 2013 - hrvoje.sen...@gmail.com + +- Smaller cleanup of phonon Requires/Conflicts/etc - don't make + Tomahawk require phonon as that package exists only via provides. + Also separete backend conflicts and recommends to separate lines + +--- Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.UtoYjr/_old 2013-12-19 12:38:06.0 +0100 +++ /var/tmp/diff_new_pack.UtoYjr/_new 2013-12-19 12:38:06.0 +0100 @@ -63,9 +63,12 @@ # Audio stuff BuildRequires: phonon-devel = 4.5.0 -Requires: phonon = 4.5.0 -Conflicts: phonon-backend-vlc 0.4 phonon-backend-gstreamer 4.5.0 phonon-backend-xine -Recommends: phonon-backend-gstreamer = 4.5.0 phonon-backend-vlc = 0.4 +Requires: libphonon4 = 4.5.0 +Conflicts: phonon-backend-vlc 0.4 +Conflicts: phonon-backend-gstreamer 4.5.0 +Conflicts: phonon-backend-xine +Recommends: phonon-backend-gstreamer = 4.5.0 +Recommends: phonon-backend-vlc = 0.4 # Optional deps for additional features BuildRequires: libjreen-devel = 1.0.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2013-06-17 10:26:25 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2013-05-16 18:16:37.0 +0200 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2013-06-17 10:26:27.0 +0200 @@ -1,0 +2,9 @@ +Tue Jun 4 16:48:43 UTC 2013 - dval...@suse.com + +- drop tomahawk-ppc64.path. Fix original issue instead + (tomahawk-nobreakpad.spec). With this patch BreakPad header is + not included id NOBREAKPAD was requested. + + Fixes TWK-1248 + +--- Old: tomahawk-ppc64.patch New: tomahawk-nobreakpad.patch Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.BoTXu8/_old 2013-06-17 10:26:28.0 +0200 +++ /var/tmp/diff_new_pack.BoTXu8/_new 2013-06-17 10:26:28.0 +0200 @@ -33,8 +33,8 @@ Source2:tomahawk.SuSEfirewall2 Source3:Tomahawk.khotkeys Source99: tomahawk-rpmlintrc -Patch0: tomahawk-ppc64.patch - +# PATCH-FIX-UPSTREAM: tomahawk-nobreakpad.patch https://bugs.tomahawk-player.org/browse/TWK-1248 dval...@suse.com -- Fix the ppc build with -DWITH_BREAKPAD=OFF +Patch0: tomahawk-nobreakpad.patch # PATCH-FIX-UPSTREAM: taken from master, remove for 0.8.x Patch1: tomahawk-0.7.0-build-portfwd-statically-and-rename-libtomahawklib-to-libtomahawk.diff ++ tomahawk-nobreakpad.patch ++ Index: tomahawk-0.7.0/src/main.cpp === --- tomahawk-0.7.0.orig/src/main.cpp +++ tomahawk-0.7.0/src/main.cpp @@ -34,8 +34,10 @@ #ifndef ENABLE_HEADLESS #include TomahawkSettingsGui.h +#ifdef WITH_BREAKPAD #include breakpad/BreakPad.h #endif +#endif #ifdef Q_OS_WIN -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2013-05-16 18:16:35 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2013-01-30 22:23:43.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2013-05-16 18:16:37.0 +0200 @@ -1,0 +2,44 @@ +Thu May 16 09:09:15 UTC 2013 - d...@dominik-schmidt.de + +- Add version to tomahawk-kde requires tomahawk + +--- +Fri May 10 11:12:28 UTC 2013 - d...@dominik-schmidt.de + +- Require the plugins instead of only recommending them + +--- +Wed May 8 14:41:50 UTC 2013 - d...@dominik-schmidt.de + +- Split main package into application, library and plugins packages + * Add tomahawk-0.7.0-build-portfwd-statically-and-rename-libtomahawklib-to-libtomahawk.diff: +Patch combines three commits from upstream master and can be +removed for 0.8.x. Without it there's an unversioned .so that +is needed by the main library. The main library also has a +wrong soname and filename for calling the package libtomahawk + +--- +Sun May 5 19:31:37 UTC 2013 - d...@dominik-schmidt.de + +- Version 0.7.0 + * JavaScript Resolvers can now expose collections. + * Introduced bundle system for JavaScript Resolvers, called axes. + * Fixed playback-loop caused by duplicate tracks in a playlist. + * Improved peer handling. + * Taking an account offline now also disconnects associated peers. + * Improved spotify protocol handling. + * Added Append to Playlist context menu item. + * User-friendlier collection handling: added info-buttons for artists and +albums. Double-clicking an item expands it now. + * Charts only load on-demand now. + * Fixed Diagnostics information not correctly updating. + * Fixed issue with hidden sidebar and panels. + * Fixed issues with some color schemes. + * Fixed playing files with special characters in the filename. + * Improved stability. + * Added translations for Catalan, Czech, Galician, Greek, Italian and +Chinese. + * (Windows) Smoother and more responsive audio playback. + * (Linux) Fixed grid issues with GTK-styles. + +--- Old: tomahawk-0.6.0.tar.bz2 New: tomahawk-0.7.0-build-portfwd-statically-and-rename-libtomahawklib-to-libtomahawk.diff tomahawk-0.7.0.tar.bz2 Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.9gi5rT/_old 2013-05-16 18:16:38.0 +0200 +++ /var/tmp/diff_new_pack.9gi5rT/_new 2013-05-16 18:16:38.0 +0200 @@ -17,17 +17,27 @@ # +%define _tomahawk_major_version 0 +%define _tomahawk_minor_version 7 +%define _tomahawk_patch_version 0 + +%define _libtomahawk_soname %{_tomahawk_major_version}_%{_tomahawk_minor_version}_%{_tomahawk_patch_version} + Name: tomahawk Summary:The social media player License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -Version:0.6.0 +Version: %{_tomahawk_major_version}.%{_tomahawk_minor_version}.%{_tomahawk_patch_version} Release:0 Source: tomahawk-%{version}.tar.bz2 Source2:tomahawk.SuSEfirewall2 Source3:Tomahawk.khotkeys Source99: tomahawk-rpmlintrc Patch0: tomahawk-ppc64.patch + +# PATCH-FIX-UPSTREAM: taken from master, remove for 0.8.x +Patch1: tomahawk-0.7.0-build-portfwd-statically-and-rename-libtomahawklib-to-libtomahawk.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://gettomahawk.com @@ -44,7 +54,7 @@ BuildRequires: boost-devel = 1.3 BuildRequires: clucene-core-devel = 2.3.3.4 BuildRequires: libattica-devel = 0.4.0 -BuildRequires: libechonest-devel = 2.0 +BuildRequires: libechonest-devel = 2.0.3 BuildRequires: liblastfm-devel = 1.0.1 BuildRequires: libqca2-devel BuildRequires: quazip-devel @@ -74,15 +84,45 @@ %package kde Summary:KDE integration for Tomahawk Group: Productivity/Multimedia/Sound/Players -Requires: tomahawk +Requires: tomahawk = %{version} Supplements:packageand(tomahawk:kdebase4-workspace) %description kde This package makes hotkeys configurable in KDE systemsettings +## Library + +%package -n libtomahawk%{_libtomahawk_soname} +Summary:Library providing the core functionality of Tomahawk Player +Group:
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2013-01-30 22:23:42 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2013-01-22 17:57:54.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2013-01-30 22:23:43.0 +0100 @@ -1,0 +2,5 @@ +Mon Jan 28 12:19:29 UTC 2013 - meiss...@suse.com + +- tomahawk-ppc64.patch: fixed ppc64 build hopefully + +--- New: tomahawk-ppc64.patch Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.ZrcXh8/_old 2013-01-30 22:23:44.0 +0100 +++ /var/tmp/diff_new_pack.ZrcXh8/_new 2013-01-30 22:23:44.0 +0100 @@ -27,6 +27,7 @@ Source2:tomahawk.SuSEfirewall2 Source3:Tomahawk.khotkeys Source99: tomahawk-rpmlintrc +Patch0: tomahawk-ppc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://gettomahawk.com @@ -81,6 +82,7 @@ %prep %setup -q -n tomahawk-%{version} +%patch0 -p1 %build cmake . \ ++ tomahawk-ppc64.patch ++ Index: tomahawk-0.6.0/thirdparty/breakpad/common/memory.h === --- tomahawk-0.6.0.orig/thirdparty/breakpad/common/memory.h +++ tomahawk-0.6.0/thirdparty/breakpad/common/memory.h @@ -93,7 +93,7 @@ class PageAllocator { private: uint8_t *GetNPages(unsigned num_pages) { -#ifdef __x86_64 +#if defined(__x86_64) || defined(__powerpc64__) void *a = sys_mmap(NULL, page_size_ * num_pages, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); #else -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2013-01-22 17:57:53 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-12-28 22:50:13.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2013-01-22 17:57:54.0 +0100 @@ -1,0 +2,42 @@ +Fri Jan 18 15:35:36 UTC 2013 - d...@dominik-schmidt.de + +- Version 0.6.0: + * Smoother scrolling in account configuration on KDE/Oxygen + * Fixed a few potential crashes + +--- +Wed Jan 9 09:05:57 UTC 2013 - d...@dominik-schmidt.de + +- Version 0.6.0beta1 + * Improved icon theme with vector graphics. + * Higher resolution artist and album images. + * You can now click artists, albums and tracks mentioned in artists' +biographies. + * New AudioControl logic - only enable Prev/Skip buttons if available. + * Added more options to right-click/context menus. + * Resolver source icon in Audiocontrols now supports being a link-back URL +to original source. + * Make friends' currently playing song (in sidebar) clickable. + * Improve MusicBrainz plugin to use normalized artist names and avoid +duplicate tracks. + * Access Control queries now stay on the bottom of the job view, removing +the tendency to jump away from the mouse. + * Improved random mode, preventing songs from being played in too rapid +succession. + * You can now choose between various view modes for your playlists. + * Nicer layout for the Artist, Album Track pages. + * Follow HTTP redirects when fetching Playlists. + * Main menu can now be hidden and instead be shown as a toolbar button. + * Connectivity controls in the toolbar. + * Cleaned up settings dialog. + * Ability to sync Spotify Starred Tracks with Tomahawk's Loved Tracks. + * Remove YouTube resolver from plug-in directory on request of YouTube. + * Fixed iTunes m3u playlist support. + * Support dropping of new Soundcloud user, track, set likes URLs. + * Added HotNewHipHop as available chart. + * Added iTunes as available source for New Releases. + * Updates and additions to translations including: Japanese, Bulgarian, +Finnish, Russian, Arabic, Chinese, Swedish, Czech and more. + * (Linux) Allow disabling of playback notifications. + +--- Old: tomahawk-0.5.5-fix-build-with-cmake-2.8.10.patch tomahawk-0.5.5.tar.bz2 New: tomahawk-0.6.0.tar.bz2 Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.SgxkaL/_old 2013-01-22 17:57:56.0 +0100 +++ /var/tmp/diff_new_pack.SgxkaL/_new 2013-01-22 17:57:56.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package tomahawk # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominik Schmidt # # All modifications and additions to the file contributed by third parties @@ -21,7 +21,7 @@ Summary:The social media player License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -Version:0.5.5 +Version:0.6.0 Release:0 Source: tomahawk-%{version}.tar.bz2 Source2:tomahawk.SuSEfirewall2 @@ -29,7 +29,6 @@ Source99: tomahawk-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://gettomahawk.com -Patch0: tomahawk-0.5.5-fix-build-with-cmake-2.8.10.patch Requires: libqt4-sql-sqlite @@ -82,7 +81,6 @@ %prep %setup -q -n tomahawk-%{version} -%patch0 -p1 %build cmake . \ @@ -130,7 +128,7 @@ %files %defattr(-,root,root,0755) -%doc LICENSE.txt README ChangeLog AUTHORS +%doc LICENSE.txt README.md ChangeLog AUTHORS %{_bindir}/tomahawk %ifnarch %arm ppc ppc64 ++ tomahawk-0.5.5.tar.bz2 - tomahawk-0.6.0.tar.bz2 ++ 1444271 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-12-28 22:50:11 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-12-19 13:31:26.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-12-28 22:50:13.0 +0100 @@ -1,0 +2,5 @@ +Tue Dec 18 21:44:30 UTC 2012 - d...@dominik-schmidt.de + +- when breakpad is disabled, also disable the crash reporter + +--- Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.Y773Gx/_old 2012-12-28 22:50:13.0 +0100 +++ /var/tmp/diff_new_pack.Y773Gx/_new 2012-12-28 22:50:13.0 +0100 @@ -92,8 +92,9 @@ -DCMAKE_INSTALL_LIBEXECDIR=lib \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -%ifarch ppc ppc64 --DWITH_BREAKPAD=NO \ +%ifarch %arm ppc ppc64 +-DWITH_CRASHREPORTER=OFF \ +-DWITH_BREAKPAD=OFF \ %endif -DBUILD_RELEASE=ON @@ -132,7 +133,7 @@ %doc LICENSE.txt README ChangeLog AUTHORS %{_bindir}/tomahawk -%ifnarch %arm +%ifnarch %arm ppc ppc64 %{_libexecdir}/tomahawk_crash_reporter %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-12-19 13:31:25 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-11-16 14:44:25.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-12-19 13:31:26.0 +0100 @@ -1,0 +2,5 @@ +Tue Dec 18 17:17:06 UTC 2012 - dval...@suse.com + +- don't build breakpad for ppc. (minidump is not implemented here) + +--- Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.RQKuIK/_old 2012-12-19 13:31:27.0 +0100 +++ /var/tmp/diff_new_pack.RQKuIK/_new 2012-12-19 13:31:27.0 +0100 @@ -92,6 +92,9 @@ -DCMAKE_INSTALL_LIBEXECDIR=lib \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE=ON \ +%ifarch ppc ppc64 +-DWITH_BREAKPAD=NO \ +%endif -DBUILD_RELEASE=ON %__make %{?_smp_mflags} || %__make -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-11-16 14:44:21 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-11-15 09:44:53.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-11-16 14:44:25.0 +0100 @@ -1,0 +2,6 @@ +Thu Nov 15 11:58:17 UTC 2012 - d...@dominik-schmidt.de + +- workaround regression in CMake 2.8.10 that makes Tomahawk + fail to link (cf. http://www.cmake.org/Bug/view.php?id=13646 ) + +--- New: tomahawk-0.5.5-fix-build-with-cmake-2.8.10.patch Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.pAC8eD/_old 2012-11-16 14:44:26.0 +0100 +++ /var/tmp/diff_new_pack.pAC8eD/_new 2012-11-16 14:44:26.0 +0100 @@ -29,6 +29,7 @@ Source99: tomahawk-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://gettomahawk.com +Patch0: tomahawk-0.5.5-fix-build-with-cmake-2.8.10.patch Requires: libqt4-sql-sqlite @@ -81,6 +82,7 @@ %prep %setup -q -n tomahawk-%{version} +%patch0 -p1 %build cmake . \ ++ tomahawk-0.5.5-fix-build-with-cmake-2.8.10.patch ++ From c910e1b58f01a42b9f99222e501172576d8cad06 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt d...@dominik-schmidt.de Date: Fri, 2 Nov 2012 21:43:11 +0100 Subject: [PATCH 01/46] Fix build with new CMake release. Doesn't harm us, but really looks like an upstream bug --- .../thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h |2 -- 1 Datei geƤndert, 2 Zeilen entfernt(-) diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h index 5f526e1..7b744e1 100644 --- a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h +++ b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h @@ -3,7 +3,6 @@ #include QtCore/QObject -#if QT_VERSION = 0x040400 || defined(DOXYGEN_RUN) #ifndef QT_NO_SHAREDMEMORY #include QtCore/QStringList @@ -138,6 +137,5 @@ QT_END_NAMESPACE #endif // QT_NO_SHAREDMEMORY -#endif // QT_VERSION = 0x040400 || defined(DOXYGEN_RUN) #endif /* __KDTOOLSCORE_KDSINGLEAPPLICATIONGUARD_H__ */ -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-11-15 09:44:46 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-10-06 18:44:27.0 +0200 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-11-15 09:44:53.0 +0100 @@ -1,0 +2,11 @@ +Wed Nov 14 15:11:13 UTC 2012 - d...@dominik-schmidt.de + +- fix Supplements: for tomahawk-kde +- Make tomahawk-kde require tomahawk itself + (pointless installing a .khotkeys file without the application) +- remove obsolete %clean section +- install ChangeLog, README, AUTHORS and LICENSE.txt +- add rpmlint filter to surpress warning about libqt4-sql-sqlite + requirement + +--- Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.G4CLrj/_old 2012-11-15 09:44:54.0 +0100 +++ /var/tmp/diff_new_pack.G4CLrj/_new 2012-11-15 09:44:54.0 +0100 @@ -43,7 +43,10 @@ BuildRequires: boost-devel = 1.3 BuildRequires: clucene-core-devel = 2.3.3.4 BuildRequires: libattica-devel = 0.4.0 +BuildRequires: libechonest-devel = 2.0 BuildRequires: liblastfm-devel = 1.0.1 +BuildRequires: libqca2-devel +BuildRequires: quazip-devel BuildRequires: sqlite3-devel = 3.6.22 BuildRequires: taglib-devel = 1.6.2 @@ -54,11 +57,8 @@ Recommends: phonon-backend-gstreamer = 4.5.0 phonon-backend-vlc = 0.4 # Optional deps for additional features -BuildRequires: libechonest-devel = 2.0 BuildRequires: libjreen-devel = 1.0.1 -BuildRequires: libqca2-devel BuildRequires: libqtweetlib-devel -BuildRequires: quazip-devel # KDE integration BuildRequires: kde4-filesystem @@ -73,7 +73,8 @@ %package kde Summary:KDE integration for Tomahawk Group: Productivity/Multimedia/Sound/Players -Supplements:packageand(kdebase4-workspace) +Requires: tomahawk +Supplements:packageand(tomahawk:kdebase4-workspace) %description kde This package makes hotkeys configurable in KDE systemsettings @@ -111,9 +112,6 @@ %__rm -rf %{buildroot}%{_datadir}/icons/hicolor/512x512 %__rm -rf %{buildroot}%{_datadir}/icons/hicolor/128x128-grayscale/ -%clean -%__rm -rf %{buildroot} - %post /sbin/ldconfig %desktop_database_post @@ -126,6 +124,7 @@ %files %defattr(-,root,root,0755) +%doc LICENSE.txt README ChangeLog AUTHORS %{_bindir}/tomahawk %ifnarch %arm ++ tomahawk-rpmlintrc ++ --- /var/tmp/diff_new_pack.G4CLrj/_old 2012-11-15 09:44:54.0 +0100 +++ /var/tmp/diff_new_pack.G4CLrj/_new 2012-11-15 09:44:54.0 +0100 @@ -3,3 +3,6 @@ # libtomahawk is shared amongst several components but has no stable api for anyone else to use (and doesnt install headers files anyways) addFilter('shlib-policy-missing-suffix') + +# libqt4-sql-sqlite is a runtime plugin which is not explicitly pulled it +addFilter('explicit-lib-dependency') -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-10-04 20:05:28 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-09-11 17:18:26.0 +0200 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-10-06 18:44:27.0 +0200 @@ -1,0 +2,12 @@ +Fri Sep 28 16:13:47 UTC 2012 - d...@dominik-schmidt.de + +- remove the crash reporter in the file list for %arm, it's not + built there - i'll investigate why it's disabled + +--- +Mon Sep 17 14:58:27 UTC 2012 - d...@dominik-schmidt.de + +- use %icon_theme_cache_post(un) +- add libqt4-sql-sqlite as runtime dependency + +--- Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.mIcBlN/_old 2012-10-06 18:44:28.0 +0200 +++ /var/tmp/diff_new_pack.mIcBlN/_new 2012-10-06 18:44:28.0 +0200 @@ -30,6 +30,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://gettomahawk.com +Requires: libqt4-sql-sqlite + BuildRequires: cmake BuildRequires: gcc-c++ @@ -115,15 +117,20 @@ %post /sbin/ldconfig %desktop_database_post +%icon_theme_cache_post %postun /sbin/ldconfig %desktop_database_postun +%icon_theme_cache_postun %files %defattr(-,root,root,0755) %{_bindir}/tomahawk + +%ifnarch %arm %{_libexecdir}/tomahawk_crash_reporter +%endif %{_libdir}/libtomahawklib.so %{_libdir}/libtomahawk_*.so -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-09-11 17:18:24 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-09-10 15:35:35.0 +0200 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-09-11 17:18:26.0 +0200 @@ -1,0 +2,6 @@ +Thu Sep 6 21:44:03 UTC 2012 - d...@dominik-schmidt.de + +- liblastfm-devel was updated to liblastfm1, so no more + liblasstm1-devel package anymore + +--- Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.zPAJJT/_old 2012-09-11 17:18:27.0 +0200 +++ /var/tmp/diff_new_pack.zPAJJT/_new 2012-09-11 17:18:27.0 +0200 @@ -41,7 +41,7 @@ BuildRequires: boost-devel = 1.3 BuildRequires: clucene-core-devel = 2.3.3.4 BuildRequires: libattica-devel = 0.4.0 -BuildRequires: liblastfm1-devel = 1.0.1 +BuildRequires: liblastfm-devel = 1.0.1 BuildRequires: sqlite3-devel = 3.6.22 BuildRequires: taglib-devel = 1.6.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-09-10 15:35:34 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-04-12 09:54:25.0 +0200 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-09-10 15:35:35.0 +0200 @@ -1,0 +2,11 @@ +Thu Aug 23 13:49:59 UTC 2012 - d...@dominik-schmidt.de + +- Version 0.5.5 + * new icon + * support .aiff + * support syncing playlists with spotify + * improved proxy support + * lots of ui improvements + * support importing last.fm history + +--- Old: tomahawk-0.4.2.tar.bz2 New: tomahawk-0.5.5.tar.bz2 Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.nJi9hh/_old 2012-09-10 15:35:37.0 +0200 +++ /var/tmp/diff_new_pack.nJi9hh/_new 2012-09-10 15:35:37.0 +0200 @@ -21,7 +21,7 @@ Summary:The social media player License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -Version:0.4.2 +Version:0.5.5 Release:0 Source: tomahawk-%{version}.tar.bz2 Source2:tomahawk.SuSEfirewall2 @@ -40,6 +40,8 @@ BuildRequires: boost-devel = 1.3 BuildRequires: clucene-core-devel = 2.3.3.4 +BuildRequires: libattica-devel = 0.4.0 +BuildRequires: liblastfm1-devel = 1.0.1 BuildRequires: sqlite3-devel = 3.6.22 BuildRequires: taglib-devel = 1.6.2 @@ -50,8 +52,7 @@ Recommends: phonon-backend-gstreamer = 4.5.0 phonon-backend-vlc = 0.4 # Optional deps for additional features -BuildRequires: libattica-devel -BuildRequires: libechonest-devel = 1.2 +BuildRequires: libechonest-devel = 2.0 BuildRequires: libjreen-devel = 1.0.1 BuildRequires: libqca2-devel BuildRequires: libqtweetlib-devel @@ -106,6 +107,7 @@ # currently not supported on openSUSE: %__rm -rf %{buildroot}%{_datadir}/icons/hicolor/512x512 +%__rm -rf %{buildroot}%{_datadir}/icons/hicolor/128x128-grayscale/ %clean %__rm -rf %{buildroot} ++ tomahawk-0.4.2.tar.bz2 - tomahawk-0.5.5.tar.bz2 ++ 301172 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-04-12 09:54:21 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-04-02 19:52:43.0 +0200 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-04-12 09:54:25.0 +0200 @@ -1,0 +2,21 @@ +Mon Apr 9 18:10:24 UTC 2012 - d...@dominik-schmidt.de + +- Version 0.4.2 + * Resuming playback restores correct volume settings. + * Reduced CPU usage during playback. + +--- +Thu Apr 5 23:51:08 UTC 2012 - d...@dominik-schmidt.de + +- Version 0.4.1 + * Fixed various crashes. + * Fixed issues with auto-updating XSPF playlists. + * Double-clicking a playlist starts playing it. + * Resolvers can now return disc number and album position for results. + * Fixed sorting playlists by track number. + * Fixed issues with changing proxy. + * Fixed Twitter authentication issues. + +- drop patch that is part of the release + +--- Old: tomahawk-0.4.0-use-qtweetlib-0.5-api.diff tomahawk-0.4.0.tar.bz2 New: tomahawk-0.4.2.tar.bz2 Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.s2wNI6/_old 2012-04-12 09:54:26.0 +0200 +++ /var/tmp/diff_new_pack.s2wNI6/_new 2012-04-12 09:54:26.0 +0200 @@ -21,7 +21,7 @@ Summary:The social media player License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -Version:0.4.0 +Version:0.4.2 Release:0 Source: tomahawk-%{version}.tar.bz2 Source2:tomahawk.SuSEfirewall2 @@ -30,9 +30,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://gettomahawk.com -# PATCH-FIX-UPSTREAM patch is taken from upstream and will be part of the 0.4.1 release -Patch0: tomahawk-0.4.0-use-qtweetlib-0.5-api.diff - BuildRequires: cmake BuildRequires: gcc-c++ @@ -80,7 +77,6 @@ %prep %setup -q -n tomahawk-%{version} -%patch0 -p1 %build cmake . \ ++ tomahawk-0.4.0.tar.bz2 - tomahawk-0.4.2.tar.bz2 ++ 31626 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-04-02 19:49:27 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-03-08 19:46:04.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-04-02 19:52:43.0 +0200 @@ -2 +2,8 @@ -Wed Mar 7 16:39:58 UTC 2012 - i...@dominik-schmidt.de +Sun Mar 18 19:18:03 UTC 2012 - d...@dominik-schmidt.de + +- fix build with QTweetLib 0.5 +- restart a failed build with a single make job so the error + is easier to spot + +--- +Wed Mar 7 16:39:58 UTC 2012 - d...@dominik-schmidt.de New: tomahawk-0.4.0-use-qtweetlib-0.5-api.diff Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.cJZm44/_old 2012-04-02 19:52:47.0 +0200 +++ /var/tmp/diff_new_pack.cJZm44/_new 2012-04-02 19:52:47.0 +0200 @@ -30,6 +30,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://gettomahawk.com +# PATCH-FIX-UPSTREAM patch is taken from upstream and will be part of the 0.4.1 release +Patch0: tomahawk-0.4.0-use-qtweetlib-0.5-api.diff + BuildRequires: cmake BuildRequires: gcc-c++ @@ -77,6 +80,7 @@ %prep %setup -q -n tomahawk-%{version} +%patch0 -p1 %build cmake . \ @@ -88,7 +92,7 @@ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DBUILD_RELEASE=ON -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %make_install ++ tomahawk-0.4.0-use-qtweetlib-0.5-api.diff ++ diff --git a/README b/README index 65df9b0..a00401e 100644 --- a/README +++ b/README @@ -40,7 +40,7 @@ Dependencies Attica 0.2.0 - ftp://ftp.kde.org/pub/kde/stable/attica/ Jreen 1.0.1 - https://github.com/euroelessar/jreen - QTweetLib 0.3.0 - https://github.com/minimoog/QTweetLib + QTweetLib 0.5.0 - https://github.com/minimoog/QTweetLib Third party libraries that we ship with our source: diff --git a/src/sip/twitter/tomahawkoauthtwitter.cpp b/src/sip/twitter/tomahawkoauthtwitter.cpp index 35cd98a..c70f669 100644 --- a/src/sip/twitter/tomahawkoauthtwitter.cpp +++ b/src/sip/twitter/tomahawkoauthtwitter.cpp @@ -12,15 +12,15 @@ TomahawkOAuthTwitter::TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject* } -int +const QString TomahawkOAuthTwitter::authorizationWidget() { bool ok; -int i = QInputDialog::getInt(0, tr( Twitter PIN ), tr( After authenticating on Twitter's web site,\nenter the displayed PIN number here: ), 0, 0, 2147483647, 1, ok); -if (ok) -return i; +const QString str = QInputDialog::getText(0, tr( Twitter PIN ), tr( After authenticating on Twitter's web site,\nenter the displayed PIN number here: ), QLineEdit::Normal, QString(), ok); +if ( ok !str.isEmpty() ) +return str; -return 0; +return QString(); } void diff --git a/src/sip/twitter/tomahawkoauthtwitter.h b/src/sip/twitter/tomahawkoauthtwitter.h index 6b1a754..a1cd533 100644 --- a/src/sip/twitter/tomahawkoauthtwitter.h +++ b/src/sip/twitter/tomahawkoauthtwitter.h @@ -16,7 +16,7 @@ public: ~TomahawkOAuthTwitter() {} protected: -virtual int authorizationWidget(); +virtual const QString authorizationWidget(); private slots: void error(); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-03-08 19:45:59 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2012-01-09 21:44:19.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-03-08 19:46:04.0 +0100 @@ -1,0 +2,39 @@ +Wed Mar 7 16:39:58 UTC 2012 - i...@dominik-schmidt.de + +- Version 0.4.0 + * Added visual notification for database indexing job. + * Fixed icons not appearing in resolvers list. + * Fixed various UI glitches and stray error messages in stations. + * Fixed bug where album page would resolve bottom-to-top. + * Fixed bug where Footnotes would not update when changing selected album in Album View. + * Fixed dragging albums and artists from charts, album, and artist views. + * Fixed bug where filter text would be one step behind filter value. + * Fixed bug where resolvers would enable themselves after auto-updating. + * Fixed occasional crash when dropping tracks onto New Station item. + * Added jump-to-current-track support for search results page. + * Fixed out of sync Show/Hide menu items on OS X when hidden with cmd-h. + * Fixed non-resolving tracks when dragging from album view. + * Fixed /Volumes directory not showing up on OS X. + * Fixed fetching album covers for albums with special characters. + * Show errors and continue gracefully when resolved audio is not available. + * Fixed various crashes on exit. + * Added basic command-line options for playback control. + * Bumped up web api timeouts to allow web clients to finish resolving. + * Added filename suggestion when exporting a playlist. + * Cleaned up highlighting of artist names in album view. + * Cleaned up alignment of playlist items. + * Fixed potential crash when searching. + * Added support for disc number. + * Added SoundCloudWall.com charts. + * Added ability to lock on to a user when listening along, to skip along. + * Fixed bug where loved tracks would be refreshed much too often. + * Fixed startup crash on OS X. + * Fixed some font size issues. + * Sped up Tomahawk startup by moving chart loading into a separate thread. + * Added support for parsing Grooveshark and Tinysong tracks and playlists. + * Reorganized sidebar to follow more logical item groupings. + * Added artist and album results to global searches. + * Fixed style and contrast issues when using GTK styles. + * Fixed paths to artwork when using MPRIS2 interface. + +--- Old: tomahawk-0.3.3.tar.bz2 New: tomahawk-0.4.0.tar.bz2 Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.U42Nn7/_old 2012-03-08 19:46:06.0 +0100 +++ /var/tmp/diff_new_pack.U42Nn7/_new 2012-03-08 19:46:06.0 +0100 @@ -16,11 +16,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: tomahawk Summary:The social media player License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -Version:0.3.3 +Version:0.4.0 Release:0 Source: tomahawk-%{version}.tar.bz2 Source2:tomahawk.SuSEfirewall2 @@ -33,14 +34,14 @@ BuildRequires: gcc-c++ # Required deps -BuildRequires: libqt4-devel = 4.7.0 BuildRequires: libQtWebKit-devel BuildRequires: libqjson-devel +BuildRequires: libqt4-devel = 4.7.0 BuildRequires: boost-devel = 1.3 -BuildRequires: taglib-devel = 1.6.2 BuildRequires: clucene-core-devel = 2.3.3.4 BuildRequires: sqlite3-devel = 3.6.22 +BuildRequires: taglib-devel = 1.6.2 # Audio stuff BuildRequires: phonon-devel = 4.5.0 @@ -49,19 +50,19 @@ Recommends: phonon-backend-gstreamer = 4.5.0 phonon-backend-vlc = 0.4 # Optional deps for additional features +BuildRequires: libattica-devel BuildRequires: libechonest-devel = 1.2 BuildRequires: libjreen-devel = 1.0.1 -BuildRequires: libqtweetlib-devel BuildRequires: libqca2-devel -BuildRequires: libattica-devel +BuildRequires: libqtweetlib-devel BuildRequires: quazip-devel # KDE integration BuildRequires: kde4-filesystem # Other -BuildRequires: update-desktop-files BuildRequires: hicolor-icon-theme +BuildRequires: update-desktop-files %description Tomahawk is a multi-source, socially-connected, cross-platform and open-source music player @@ -85,9 +86,6 @@ -DCMAKE_INSTALL_LIBEXECDIR=lib \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -%ifarch x86_64 --DLIB_SUFFIX=64 \ -%endif
commit tomahawk for openSUSE:Factory
Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-01-09 21:44:18 Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) Package is tomahawk, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes2011-12-19 16:10:29.0 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-01-09 21:44:19.0 +0100 @@ -1,0 +2,8 @@ +Mon Jan 9 14:49:24 UTC 2012 - d...@dominik-schmidt.de + +- Add tomahawk-kde package for optional KDE integration + * makes multimedia keys configurable from systemsettings +- use rpm macros more consistently +- update formatting + +--- New: Tomahawk.khotkeys Other differences: -- ++ tomahawk.spec ++ --- /var/tmp/diff_new_pack.prIbp1/_old 2012-01-09 21:44:20.0 +0100 +++ /var/tmp/diff_new_pack.prIbp1/_new 2012-01-09 21:44:20.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package tomahawk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominik Schmidt # # All modifications and additions to the file contributed by third parties @@ -16,22 +16,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: tomahawk Summary:The social media player -Version:0.3.3 -Release:0 License:GPL-3.0+ Group: Productivity/Multimedia/Sound/Players +Version:0.3.3 +Release:0 Source: tomahawk-%{version}.tar.bz2 Source2:tomahawk.SuSEfirewall2 +Source3:Tomahawk.khotkeys Source99: tomahawk-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://gettomahawk.com -BuildRequires: cmake gcc-c++ +BuildRequires: cmake +BuildRequires: gcc-c++ # Required deps BuildRequires: libqt4-devel = 4.7.0 @@ -54,7 +53,11 @@ BuildRequires: libjreen-devel = 1.0.1 BuildRequires: libqtweetlib-devel BuildRequires: libqca2-devel -BuildRequires: libattica-devel quazip-devel +BuildRequires: libattica-devel +BuildRequires: quazip-devel + +# KDE integration +BuildRequires: kde4-filesystem # Other BuildRequires: update-desktop-files @@ -63,6 +66,14 @@ %description Tomahawk is a multi-source, socially-connected, cross-platform and open-source music player +%package kde +Summary:KDE integration for Tomahawk +Group: Productivity/Multimedia/Sound/Players +Supplements:packageand(kdebase4-workspace) + +%description kde +This package makes hotkeys configurable in KDE systemsettings + %prep %setup -q -n tomahawk-%{version} @@ -73,20 +84,28 @@ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_LIBEXECDIR=lib \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ +-DCMAKE_VERBOSE_MAKEFILE=ON \ %ifarch x86_64 -DLIB_SUFFIX=64 \ %endif -DBUILD_RELEASE=ON -make VERBOSE=1 %{?_smp_mflags} +%__make %{?_smp_mflags} %install -%makeinstall +%make_install -install -D -m 644 %{_sourcedir}/tomahawk.SuSEfirewall2 \ +# install firewall service file +%__install -D -m 644 %{_sourcedir}/tomahawk.SuSEfirewall2 \ %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/tomahawk + +# update desktop file %suse_update_desktop_file -r tomahawk AudioVideo Player +# install hotkey integration for kde +%__install -D -m 644 %{_sourcedir}/Tomahawk.khotkeys \ +%{buildroot}%{_kde4_appsdir}/khotkeys/Tomahawk.khotkeys + # currently not supported on openSUSE: %__rm -rf %{buildroot}%{_datadir}/icons/hicolor/512x512 @@ -114,4 +133,9 @@ %config /etc/sysconfig/SuSEfirewall2.d/services/tomahawk +%files kde +%defattr(-,root,root,0755) +%dir %{_kde4_appsdir}/khotkeys/ +%{_kde4_appsdir}/khotkeys/Tomahawk.khotkeys + %changelog ++ Tomahawk.khotkeys ++ [Data] DataCount=1 [Data_1] Comment=Comment DataCount=4 Enabled=false Name=Tomahawk SystemGroup=0 Type=ACTION_DATA_GROUP [Data_1Conditions] Comment= ConditionsCount=0 [Data_1_1] Comment=Comment Enabled=false Name=Next Type=SIMPLE_ACTION_DATA [Data_1_1Actions] ActionsCount=1 [Data_1_1Actions0] Arguments= Call=Next RemoteApp=org.mpris.MediaPlayer2.tomahawk RemoteObj=/org/mpris/MediaPlayer2 Type=DBUS [Data_1_1Conditions] Comment= ConditionsCount=0 [Data_1_1Triggers] Comment=Simple_action TriggersCount=1 [Data_1_1Triggers0] Key=Media Next Type=SHORTCUT Uuid={f11a7735-7889-4e7a-875c-3e6c829f9418} [Data_1_2] Comment=Comment Enabled=false Name=Previous Type=SIMPLE_ACTION_DATA [Data_1_2Actions] ActionsCount=1 [Data_1_2Actions0] Arguments=