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.changes 2017-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 - [email protected] + +- 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: Productivity/Multimedia/Sound/Players Requires: tomahawk = %{version} -Supplements: packageand(tomahawk:kdebase4-workspace) +Supplements: packageand(tomahawk:plasma5-workspace) %description kde This package makes hotkeys configurable in KDE systemsettings @@ -141,16 +139,6 @@ %description -n libtomahawk-plugins-telepathy Plugin providing the Telepathy functionality of Tomahawk Player a multi-source, socially-connected, cross-platform and open-source music player -%package -n libtomahawk-plugins-telepathy-kde -Summary: Plugin providing the KDE config for the Telepathy in Tomahawk -Group: Productivity/Multimedia/Sound/Players -Requires: libtomahawk-plugins-telepathy -Supplements: packageand(tomahawk-kde:telepathy-kde) - -%description -n libtomahawk-plugins-telepathy-kde -Plugin providing the KDE config for the Telepathy in Tomahawk Player a multi-source, socially-connected, cross-platform and open-source music player - - %package -n libtomahawk-plugins Summary: Plugins providing the core functionality of Tomahawk Player Group: Productivity/Multimedia/Sound/Players @@ -158,10 +146,9 @@ %description -n libtomahawk-plugins Plugins providing the core functionality of Tomahawk Player a multi-source, socially-connected, cross-platform and open-source music player - %prep -%setup -q -n tomahawk-%{version} -%patch0 -p1 +%setup -q +%patch1 -p1 %build cmake . \ @@ -172,8 +159,8 @@ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_SKIP_RPATH=ON \ -%ifarch %arm ppc ppc64 ppc64le -DWITH_CRASHREPORTER=OFF \ +%ifarch %arm ppc ppc64 ppc64le -DWITH_BREAKPAD=OFF \ %endif -DBUILD_RELEASE=ON @@ -192,7 +179,7 @@ # install hotkey integration for kde %__install -D -m 644 %{_sourcedir}/Tomahawk.khotkeys \ - %{buildroot}%{_kde4_appsdir}/khotkeys/Tomahawk.khotkeys + %{buildroot}%{_datadir}/khotkeys/Tomahawk.khotkeys # currently not "supported" on openSUSE: %__rm -rf "%{buildroot}%{_datadir}/icons/hicolor/1024x1024" @@ -202,6 +189,7 @@ %post %desktop_database_post %icon_theme_cache_post + %postun %desktop_database_postun %icon_theme_cache_postun @@ -240,8 +228,8 @@ %files kde %defattr(-,root,root,0755) -%dir %{_kde4_appsdir}/khotkeys/ -%{_kde4_appsdir}/khotkeys/Tomahawk.khotkeys +%dir %{_datadir}/khotkeys/ +%{_datadir}/khotkeys/Tomahawk.khotkeys ## Library @@ -276,8 +264,4 @@ %defattr(-,root,root,0755) %{_libdir}/libtomahawk_configstorage_telepathy.so -%files -n libtomahawk-plugins-telepathy-kde -%defattr(-,root,root,0755) -%{_libdir}/libtomahawk_configstorage_telepathy_kde.so - %changelog ++++++ 0001-Fix-control-reaches-end-of-non-void-function-in-Dele.patch ++++++ >From 8e290e398812aa32eeded1a7ceedae36dc8a8c59 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Sun, 10 Dec 2017 09:30:53 +0100 Subject: [PATCH] Fix "control reaches end of non-void function" in DelegateConfigWrapper --- src/libtomahawk/accounts/DelegateConfigWrapper.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libtomahawk/accounts/DelegateConfigWrapper.cpp b/src/libtomahawk/accounts/DelegateConfigWrapper.cpp index e78b64aec..184076e26 100644 --- a/src/libtomahawk/accounts/DelegateConfigWrapper.cpp +++ b/src/libtomahawk/accounts/DelegateConfigWrapper.cpp @@ -246,6 +246,8 @@ DelegateConfigWrapper::getTestConfigMessage( int code ) return tr( "Action not allowed, account is in use elsewhere." ); case Tomahawk::Accounts::ConfigTestResultAccountExpired: return tr( "Your account has expired." ); + default: + return QString(); } } -- 2.15.0 ++++++ _service ++++++ <services> <service mode="disabled" name="obs_scm"> <param name="url">https://github.com/tomahawk-player/tomahawk.git</param> <param name="scm">git</param> <param name="versionformat">0.8.99~git%ci</param> </service> <service mode="buildtime" name="tar" /> <service mode="buildtime" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="buildtime" name="set_version" /> </services> ++++++ tomahawk.obsinfo ++++++ name: tomahawk version: 0.8.99~git20170808T143449 mtime: 1502195689 commit: 00f602e10203b76fc28b4615868c567e6bd4ced4
