From b920e54e68efaf0874afc6f5a10c3aa8fd7675a1bef1df36a77322e4807fdf75 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 22 Apr 2016 14:16:56 +0000 Subject: [PATCH] Accepting request 390320 from KDE:Distro:Factory Update to libktorrent 2.0 (KF5/Qt5 port) OBS-URL: https://build.opensuse.org/request/show/390320 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libktorrent?expand=0&rev=33 --- libktorrent-1.3.1.tar.bz2 | 3 --- libktorrent-2.0.tar.xz | 3 +++ libktorrent.changes | 9 ++++++++ libktorrent.spec | 48 +++++++++++++++++++++------------------ 4 files changed, 38 insertions(+), 25 deletions(-) delete mode 100644 libktorrent-1.3.1.tar.bz2 create mode 100644 libktorrent-2.0.tar.xz diff --git a/libktorrent-1.3.1.tar.bz2 b/libktorrent-1.3.1.tar.bz2 deleted file mode 100644 index 3810b9c..0000000 --- a/libktorrent-1.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725 -size 863105 diff --git a/libktorrent-2.0.tar.xz b/libktorrent-2.0.tar.xz new file mode 100644 index 0000000..fe827ce --- /dev/null +++ b/libktorrent-2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:478b1cad920d00c85605b686ed2ff893c8a875840370e9c261d1c7c102e92b9c +size 676408 diff --git a/libktorrent.changes b/libktorrent.changes index 1ce1850..d45b341 100644 --- a/libktorrent.changes +++ b/libktorrent.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Apr 16 11:33:32 UTC 2016 - tittiatcoke@gmail.com + +- Update to version 2.0 + * Ported to Qt5/KF5 + * QHttp-based tracker communication was dropped in favour of KIO-based one + * Optimize queue data structures shown up be callgrind + * fix issues found by Coverity static analyzer + ------------------------------------------------------------------- Fri Jan 18 10:33:50 UTC 2013 - nico.kruber@gmail.com diff --git a/libktorrent.spec b/libktorrent.spec index 7b80c44..e7c0c3b 100644 --- a/libktorrent.spec +++ b/libktorrent.spec @@ -1,7 +1,7 @@ # # spec file for package libktorrent # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,21 +16,32 @@ # +%define ktor_ver 5.0 + Name: libktorrent -Version: 1.3.1 +Version: 2.0 Release: 0 -%define sonum 5 +%define sonum 6 Summary: Torrent Downloading Library License: GPL-2.0+ Group: Productivity/Networking/File-Sharing Url: http://ktorrent.org/ -Source0: http://ktorrent.org/downloads/4.3.1/%{name}-%{version}.tar.bz2 +Source0: http://download.kde.org/stable/ktorrent/%{ktor_ver}/%{name}-%{version}.tar.xz BuildRequires: boost-devel BuildRequires: doxygen +BuildRequires: extra-cmake-modules BuildRequires: gmp-devel +BuildRequires: karchive-devel +BuildRequires: kdelibs4support-devel +BuildRequires: ki18n-devel +BuildRequires: kio-devel BuildRequires: libgcrypt-devel -BuildRequires: libkde4-devel -BuildRequires: libqca2-devel +BuildRequires: libqca-qt5-devel +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Widgets) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,7 +50,10 @@ libktorrent is a torrent downloading library. %package devel Summary: Development files for libktorrent Group: Development/Libraries/C and C++ +Requires: boost-devel +Requires: gmp-devel Requires: libktorrent%{sonum} = %{version} +Requires: libqca-qt5-devel %description devel This package includes the necessary files for development using libktorrent. @@ -59,21 +73,11 @@ libktorrent is a torrent downloading library. %setup -q -n %{name}-%{version} %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -cd build -%kde4_makeinstall -cd .. - -# Remove unneeded locales -%if 0%{?suse_version} && 0%{?suse_version} < 1140 - rm -rf %{buildroot}%{_datadir}/locale/ast/ - rm -rf %{buildroot}%{_datadir}/locale/hne/ - rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/ - rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/ -%endif +%kf5_makeinstall -C build %find_lang %{name} @@ -86,14 +90,14 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root,-) -%{_kde4_includedir}/libktorrent/ -%{_kde4_libdir}/libktorrent.so -%{_kde4_appsdir}/cmake/modules/FindKTorrent.cmake +%{_includedir}/libktorrent/ +%{_libdir}/libktorrent.so +%{_libdir}/cmake/LibKTorrent/ %files -n libktorrent%{sonum} %defattr(-,root,root,-) %doc COPYING ChangeLog RoadMap -%{_kde4_libdir}/libktorrent.so.%{sonum}* +%{_libdir}/libktorrent.so.%{sonum}* %files -n libktorrent%{sonum}-lang -f %{name}.lang %defattr(-,root,root,-)