Hello community,
here is the log from the commit of package ktorrent for openSUSE:Factory
checked in at 2015-10-12 10:01:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-02-12
10:21:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ktorrent.new/ktorrent.changes 2015-10-12
10:01:18.000000000 +0200
@@ -1,0 +2,13 @@
+Sun Oct 11 09:51:39 UTC 2015 - lbeltr...@kde.org
+
+- Ensure the Plasma applet removal only occurs on Tumbleweed and
+ Leap
+
+-------------------------------------------------------------------
+Sun Oct 11 09:12:07 UTC 2015 - lbeltr...@kde.org
+
+- Add remove-plasma.diff: Disable building the plasma applet,
+ which is totally non functional in Plasma 5 and adds an
+ unnecessary dependency on kdebase4-workspace
+
+-------------------------------------------------------------------
New:
----
remove-plasma.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ktorrent.spec ++++++
--- /var/tmp/diff_new_pack.mSAktw/_old 2015-10-12 10:01:19.000000000 +0200
+++ /var/tmp/diff_new_pack.mSAktw/_new 2015-10-12 10:01:19.000000000 +0200
@@ -38,9 +38,13 @@
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
+# PATCH-FIX-OPENSUSE remove-plasma.diff -- disable building the Plasma applet
+Patch5: remove-plasma.diff
BuildRequires: ImageMagick
BuildRequires: fdupes
+%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse}
BuildRequires: kdebase4-workspace-devel
+%endif
BuildRequires: libkdepimlibs4-devel
BuildRequires: libktorrent-devel >= 1.3.0
%if %suse_version > 1200
@@ -79,6 +83,9 @@
tar jxf %{SOURCE1}
%patch3
%patch4 -p1
+%if 0%{?suse_version} > 1320 || 0%{?is_opensuse}
+%patch5 -p1
+%endif
%build
%cmake_kde4 -d build
@@ -136,8 +143,10 @@
%{_kde4_bindir}/ktorrent
%{_kde4_bindir}/ktupnptest
%{_kde4_modulesdir}/kt*.so
+%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse}
%{_kde4_modulesdir}/plasma_applet_ktorrent.so
%{_kde4_modulesdir}/plasma_engine_ktorrent.so
+%endif
%{_kde4_libdir}/libktcore.so.*
%{_kde4_applicationsdir}/ktorrent.desktop
%{_kde4_iconsdir}/hicolor/*/actions/kt-*.*
@@ -145,9 +154,12 @@
%{_kde4_iconsdir}/hicolor/*/mimetypes/torrent.*
%{_kde4_appsdir}/ktorrent/
%{_kde4_servicesdir}/kt*.desktop
+%{_kde4_servicetypesdir}/ktorrentplugin.desktop
+%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse}
%{_kde4_servicesdir}/plasma-applet-ktorrent.desktop
%{_kde4_servicesdir}/plasma-dataengine-ktorrent.desktop
-%{_kde4_servicetypesdir}/ktorrentplugin.desktop
+%endif
+
%doc %{_mandir}/man1/ktorrent.1%{ext_man}
%doc %{_mandir}/man1/ktupnptest.1%{ext_man}
++++++ remove-plasma.diff ++++++
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4973e3..f6b7142 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,6 @@ add_subdirectory(libktcore)
add_subdirectory(plugins)
add_subdirectory(ktorrent)
add_subdirectory(ktupnptest)
-add_subdirectory(plasma)
add_subdirectory(ktmagnetdownloader)
add_subdirectory(doc)
