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.changes 2011-12-19 16:10:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-01-09 21:44:19.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Jan 9 14:49:24 UTC 2012 - [email protected] + +- 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.000000000 +0100 +++ /var/tmp/diff_new_pack.prIbp1/_new 2012-01-09 21:44:20.000000000 +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= Call=Previous RemoteApp=org.mpris.MediaPlayer2.tomahawk RemoteObj=/org/mpris/MediaPlayer2 Type=DBUS [Data_1_2Conditions] Comment= ConditionsCount=0 [Data_1_2Triggers] Comment=Simple_action TriggersCount=1 [Data_1_2Triggers0] Key=Media Previous Type=SHORTCUT Uuid={c68b9af1-3680-4fb8-b1dc-99ec63187d9d} [Data_1_3] Comment=Comment Enabled=false Name=PlayPause Type=SIMPLE_ACTION_DATA [Data_1_3Actions] ActionsCount=1 [Data_1_3Actions0] Arguments= Call=PlayPause RemoteApp=org.mpris.MediaPlayer2.tomahawk RemoteObj=/org/mpris/MediaPlayer2 Type=DBUS [Data_1_3Conditions] Comment= ConditionsCount=0 [Data_1_3Triggers] Comment=Simple_action TriggersCount=1 [Data_1_3Triggers0] Key=Media Play Type=SHORTCUT Uuid={ba3f9846-ea5f-4085-990d-92adf487cf81} [Data_1_4] Comment=Comment Enabled=false Name=Stop Type=SIMPLE_ACTION_DATA [Data_1_4Actions] ActionsCount=1 [Data_1_4Actions0] Arguments= Call=Stop RemoteApp=org.mpris.MediaPlayer2.tomahawk RemoteObj=/org/mpris/MediaPlayer2 Type=DBUS [Data_1_4Conditions] Comment= ConditionsCount=0 [Data_1_4Triggers] Comment=Simple_action TriggersCount=1 [Data_1_4Triggers0] Key=Media Stop Type=SHORTCUT Uuid={b2fb5c13-8348-455d-b2e8-1afb68806f86} [Main] AllowMerge=true ImportId=org.tomahawk-player.khotkeys Version=2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
