Hello community, here is the log from the commit of package ktorrent for openSUSE:Factory checked in at 2015-02-12 10:21:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktorrent (Old) and /work/SRC/openSUSE:Factory/.ktorrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktorrent" Changes: -------- --- /work/SRC/openSUSE:Factory/ktorrent/ktorrent.changes 2014-06-16 21:28:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktorrent.new/ktorrent.changes 2015-02-12 10:21:39.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Jan 31 19:48:18 UTC 2015 - [email protected] + +- Add properly-support-x-scheme-handler-magnet-mimetype.patch, + make ktorrent support magnet mimetype outside KDE4 + +------------------------------------------------------------------- New: ---- properly-support-x-scheme-handler-magnet-mimetype.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktorrent.spec ++++++ --- /var/tmp/diff_new_pack.rCfiYx/_old 2015-02-12 10:21:40.000000000 +0100 +++ /var/tmp/diff_new_pack.rCfiYx/_new 2015-02-12 10:21:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ktorrent # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,6 +36,8 @@ Patch2: initial-preference.diff # PATCH-FIX-UPSTREAM ipfilter_bugfix.diff -- Fix gzip not working in ipfilter plugin due to wrong mimetype, kde#315239 Patch3: ipfilter_bugfix.diff +# PATCH-FIX-UPSTREAM properly-support-x-scheme-handler-magnet-mimetype.patch -- make ktorrent support magnet mimetype outside KDE4 +Patch4: properly-support-x-scheme-handler-magnet-mimetype.patch BuildRequires: ImageMagick BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel @@ -76,15 +78,14 @@ %patch2 tar jxf %{SOURCE1} %patch3 +%patch4 -p1 %build %cmake_kde4 -d build %make_jobs %install -cd build -%kde4_makeinstall -cd .. +%kde4_makeinstall -C build # Not needed, fix "devel-file-in-non-devel-package" rpmlint warning rm -f %{buildroot}%{_kde4_libdir}/libktcore.so @@ -144,7 +145,6 @@ %{_kde4_iconsdir}/hicolor/*/mimetypes/torrent.* %{_kde4_appsdir}/ktorrent/ %{_kde4_servicesdir}/kt*.desktop -%{_kde4_servicesdir}/magnet.protocol %{_kde4_servicesdir}/plasma-applet-ktorrent.desktop %{_kde4_servicesdir}/plasma-dataengine-ktorrent.desktop %{_kde4_servicetypesdir}/ktorrentplugin.desktop ++++++ properly-support-x-scheme-handler-magnet-mimetype.patch ++++++ commit f090d11e8837d944dedb40f873713abe4e15d4b4 Author: Joris Guisson <[email protected]> Date: Sat Nov 8 12:35:09 2014 +0100 Properly support x-scheme-handler/magnet mimetype, and drop old hard-coded magnet.protocol. Patch from Rex Dieter Review: 108648 diff --git a/ktorrent/CMakeLists.txt b/ktorrent/CMakeLists.txt index 3d61cfd..3e64bc1 100644 --- a/ktorrent/CMakeLists.txt +++ b/ktorrent/CMakeLists.txt @@ -94,9 +94,5 @@ install(FILES ktorrent.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ktorrent ) install(FILES dhttip DESTINATION ${DATA_INSTALL_DIR}/ktorrent) -if (NOT ${ENABLE_KIO_MAGNET}) - install(FILES magnet.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -endif (NOT ${ENABLE_KIO_MAGNET}) - add_subdirectory(icons) diff --git a/ktorrent/ktorrent.desktop b/ktorrent/ktorrent.desktop index d326f63..dff843f 100755 --- a/ktorrent/ktorrent.desktop +++ b/ktorrent/ktorrent.desktop @@ -118,7 +118,7 @@ Exec=ktorrent %i -caption "%c" %u Icon=ktorrent Type=Application X-DocPath=ktorrent/index.html -MimeType=application/x-bittorrent;application/x-torrent; +MimeType=application/x-bittorrent;application/x-torrent;x-scheme-handler/magnet; InitialPreference=5 X-DBUS-StartupType=Unique X-DBUS-ServiceName=org.ktorrent.ktorrent -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
