rpm/ktorrent
SHA256
1
0
Fork 0
forked from pool/ktorrent
Code Pull Requests Activity

Accepting request 337903 from KDE:Extra

Browse Source 
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

OBS-URL: https://build.opensuse.org/request/show/337903
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=100
This commit is contained in:
Stephan Kulow 2015-10-12 08:01:16 +00:00 committed by Git OBS Bridge
parent 6b6399623b
commit dd9e113ecd
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ktorrent.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sun Oct 11 09:51:39 UTC 2015 - lbeltrame@kde.org
- Ensure the Plasma applet removal only occurs on Tumbleweed and
Leap
-------------------------------------------------------------------
Sun Oct 11 09:12:07 UTC 2015 - lbeltrame@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
-------------------------------------------------------------------
Sat Jan 31 19:48:18 UTC 2015 - hrvoje.senjan@gmail.com

14
ktorrent.spec
View File

@ -38,9 +38,13 @@ Patch2: initial-preference.diff
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 @@ for BitTorrent.
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 @@ rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/
%{_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 @@ rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/
%{_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}

12
remove-plasma.diff Normal file
View File

@ -0,0 +1,12 @@
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)