From 3133af47e2bd80f9ef7106e824c5cf755675fc579335721c11fce0d10030742a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 3 Feb 2009 21:21:51 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=38 --- function-address.diff | 11 -------- ktorrent-3.2beta1.tar.bz2 | 3 --- ktorrent-3.2rc1.tar.bz2 | 3 +++ ktorrent.changes | 14 ++++++++++ ktorrent.spec | 23 ++++++++++++----- trunk.diff | 54 --------------------------------------- 6 files changed, 33 insertions(+), 75 deletions(-) delete mode 100644 function-address.diff delete mode 100644 ktorrent-3.2beta1.tar.bz2 create mode 100644 ktorrent-3.2rc1.tar.bz2 delete mode 100644 trunk.diff diff --git a/function-address.diff b/function-address.diff deleted file mode 100644 index 42a1411..0000000 --- a/function-address.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/webinterface/httpserver.cpp -+++ plugins/webinterface/httpserver.cpp -@@ -468,7 +468,7 @@ namespace kt - - QDataStream out(&tmp_file); - out.writeRawData(ptr + (pos + 4),len - (pos + 4)); -- out << flush; -+ tmp_file.flush(); - tmp_file.close(); - - Out(SYS_WEB|LOG_NOTICE) << "Loading file " << save_file << endl; diff --git a/ktorrent-3.2beta1.tar.bz2 b/ktorrent-3.2beta1.tar.bz2 deleted file mode 100644 index 7eaa289..0000000 --- a/ktorrent-3.2beta1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84048298231274e2d5a3ceec2dcf06822f9080356a2a38d650bf710a3b66979e -size 2670434 diff --git a/ktorrent-3.2rc1.tar.bz2 b/ktorrent-3.2rc1.tar.bz2 new file mode 100644 index 0000000..85a5114 --- /dev/null +++ b/ktorrent-3.2rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73104a5c7c22698d29a1ab7d90bbcf8fa366c915c5068558e232df66d6e4c4a5 +size 2577503 diff --git a/ktorrent.changes b/ktorrent.changes index 2095b31..8f5f8b6 100644 --- a/ktorrent.changes +++ b/ktorrent.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Feb 2 13:40:13 CET 2009 - stbinner@suse.de + +- update to 3.2 RC1: + * Several memory leaks have been fixed + * CPU usage has been reduced + * The queue manager has been revamped + * Fixed a bug causing download speed to get stuck at 128 KB/s + with small chunks + * Moving files when the torrents is complete, now happens after + the data check when the torrent is complete + * The webgui has been revamped, PHP is ditched in favor of a + HTML and AJAX approach + ------------------------------------------------------------------- Sat Jan 17 20:24:22 CET 2009 - coolo@suse.de diff --git a/ktorrent.spec b/ktorrent.spec index 089d607..8dabcd8 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -1,5 +1,5 @@ # -# spec file for package ktorrent (Version 3.1.99+3.2beta1) +# spec file for package ktorrent (Version 3.1.99+3.2rc1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,16 +26,14 @@ Url: http://ktorrent.pwsp.net/ License: GPL v2 or later Group: Productivity/Networking/File-Sharing Summary: KDE BitTorrent Client -Version: 3.1.99+3.2beta1 +Version: 3.1.99+3.2rc1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define rversion 3.2beta1 +%define rversion 3.2rc1 Source: %{name}-%{rversion}.tar.bz2 Source2: icons.tar.bz2 Patch1: remove-links.diff -Patch2: function-address.diff Patch3: proxy.diff -Patch4: trunk.diff %if %suse_version > 1020 Requires: %{name}-lang = %{version} %endif @@ -78,9 +76,7 @@ Authors: %prep %setup -q -n %name-%{rversion} %patch1 -%patch2 %patch3 -%patch4 tar xfj %{SOURCE2} %build @@ -177,6 +173,8 @@ tar xfj %{SOURCE2} %_kde_share_dir/services/ktwebinterfaceplugin.desktop %_kde_share_dir/services/ktmediaplayerplugin.desktop %_kde_share_dir/servicetypes/ktorrentplugin.desktop +/usr/%_lib/kde4/ktzeroconfplugin.so +/usr/share/kde4/services/ktzeroconfplugin.desktop %files devel %defattr(-,root,root) @@ -186,6 +184,17 @@ tar xfj %{SOURCE2} /usr/include/libbtcore %changelog +* Mon Feb 02 2009 stbinner@suse.de +- update to 3.2 RC1: + * Several memory leaks have been fixed + * CPU usage has been reduced + * The queue manager has been revamped + * Fixed a bug causing download speed to get stuck at 128 KB/s + with small chunks + * Moving files when the torrents is complete, now happens after + the data check when the torrent is complete + * The webgui has been revamped, PHP is ditched in favor of a + HTML and AJAX approach * Sat Jan 17 2009 coolo@suse.de - apply trunk.diff to compile with plasma from 4.2 * Mon Jan 12 2009 dmueller@suse.de diff --git a/trunk.diff b/trunk.diff deleted file mode 100644 index 79d121e..0000000 --- a/trunk.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- CMakeLists.txt (Revision 912562) -+++ CMakeLists.txt (Revision 912562) -@@ -4,9 +4,17 @@ - find_package(GMP REQUIRED) - find_package(QCA2 REQUIRED) - find_package(Strigi REQUIRED) --macro_optional_find_package(Plasma) --macro_log_feature(PLASMA_FOUND "Plasma" "Plasma libraries and header files" "http://plasma.kde.org/" FALSE "" "Plasma is needed for KTorrent Plasmoid") - -+# backward compatibility to <= KDE 4.1 -+MACRO_ENSURE_VERSION( "4.1.83" ${KDE_VERSION} KDE_VERSION_OK) -+if(NOT KDE_VERSION_OK) -+ macro_optional_find_package(Plasma) -+ macro_log_feature(PLASMA_FOUND "Plasma" "Plasma libraries and header files" "http://plasma.kde.org/" FALSE "" "Plasma is needed for KTorrent Plasmoid") -+else(NOT KDE_VERSION_OK) -+ set(PLASMA_FOUND true) -+ set(PLASMA_LIBS ${KDE4_PLASMA_LIBS}) -+endif(NOT KDE_VERSION_OK) -+ - # set some default settings - include(KDE4Defaults) - ---- plasma/applet/CMakeLists.txt (Revision 912562) -+++ plasma/applet/CMakeLists.txt (Revision 912562) -@@ -1,10 +1,20 @@ --set(ktapplet_SRCS applet.cpp chunkbar.cpp) -- -- --kde4_add_ui_files(ktapplet_SRCS appletconfig.ui) -+set(TASKMANAGER_FOUND FALSE) -+FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h) -+FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) - --kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS}) --target_link_libraries(plasma_applet_ktorrent ${PLASMA_LIBS} ${KDE4_KIO_LIBS} taskmanager btcore ktcore) -+if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY) -+ set(TASKMANAGER_FOUND TRUE) -+ message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ") -+ include_directories(${TASKMANAGER_INCLUDE_DIR}) -+ set(ktapplet_SRCS applet.cpp chunkbar.cpp) -+ -+ kde4_add_ui_files(ktapplet_SRCS appletconfig.ui) -+ -+ kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS}) -+ target_link_libraries(plasma_applet_ktorrent ${PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} btcore ktcore) -+ -+ install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR}) -+ install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -+endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY) - --install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR}) --install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -+macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid") -\ No newline at end of file