Accepting request 43162 from KDE:Distro:Factory

Copy from KDE:Distro:Factory/ktorrent based on submit request 43162 from user Beineri

OBS-URL: https://build.opensuse.org/request/show/43162
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=58
This commit is contained in:
OBS User autobuild 2010-07-19 19:25:50 +00:00 committed by Git OBS Bridge
parent 4940c10b21
commit 62dd79c50c
7 changed files with 53 additions and 54 deletions

View File

@ -1,8 +1,6 @@
Index: ktorrent/ktorrent.desktop
===================================================================
--- ktorrent/ktorrent.desktop.orig
+++ ktorrent/ktorrent.desktop
@@ -94,6 +94,7 @@ Icon=ktorrent
--- ktorrent/ktorrent.desktop 2010-06-14 18:29:38.000000000 +0200
+++ ktorrent/ktorrent.desktop 2010-06-27 21:19:32.880094144 +0200
@@ -106,6 +106,7 @@
Type=Application
DocPath=ktorrent/index.html
MimeType=application/x-bittorrent;application/x-torrent;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f31fb80569df7f102685c85becb73fa1cac239ae8e9399424abb8c0048289826
size 2786041

3
ktorrent-4.0.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2f3e659c16afb2f94f4be5f84d147b34592b2c39a1e5d3bb23462a631947c5d
size 2819309

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Jul 9 09:13:31 UTC 2010 - beineri@opensuse.org
- update to 4.0.2
* Fix wrong X-KDE-PluginInfo-Name in ktzeroconfplugin.desktop
* Fix crash caused by 0 pointer in webinterface plugin
* Increase auto update retry interval of ipfilter plugin to 15 min
* Fix bug causing groups file to grow very large over time
-------------------------------------------------------------------
Sun Jun 27 19:05:38 UTC 2010 - tittiatcoke@gmail.com
- update to 4.0.1
* bugfix release
* Several crashes have been fixed, as well as a problem which
caused a lot of disk activity when downloading at high speed
on certain filesystems.
* Authentication can now be disabled in the webinterface
(use with care obviously)
* A new plugin to generate magnet URI's from torrents was added
* Events like hibernating and the network going down for some time,
are now handled in a better way.
-------------------------------------------------------------------
Sat Jun 26 09:08:21 UTC 2010 - cmorve69@yahoo.es

View File

@ -1,5 +1,5 @@
#
# spec file for package ktorrent (Version 3.3.4)
# spec file for package ktorrent (Version 4.0.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,21 +19,18 @@
Name: ktorrent
BuildRequires: gmp-devel kdebase4-workspace-devel libkdepimlibs4-devel libqca2-devel taglib-devel
%if %suse_version > 1020
BuildRequires: fdupes
%endif
BuildRequires: fdupes libktorrent-devel
Url: http://ktorrent.pwsp.net/
License: GPLv2+
Group: Productivity/Networking/File-Sharing
Summary: KDE BitTorrent Client
Version: 3.3.4
Release: 2
Version: 4.0.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define rversion %version
Source: %{name}-%{rversion}.tar.bz2
Source: %{name}-%{version}.tar.bz2
Source2: icons.tar.bz2
Patch1: remove-links.diff
Patch3: proxy.diff
Patch4: suse-dht-warning.diff
Patch5: initial-preference.diff
Requires: %{name}-lang = %{version}
@ -75,7 +72,6 @@ Authors:
%prep
%setup -q -n %name-%{rversion}
%patch1
%patch3
%if ! 0%{?packman_bs}
%patch4
%endif
@ -105,18 +101,19 @@ tar xfj %{SOURCE2}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%if %suse_version > 1020
%files lang -f build/%name.lang
%defattr(-,root,root)
%dir /usr/share/locale/sr@ijekavian
%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES
%dir /usr/share/locale/sr@ijekavianlatin
%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES
%files
%else
%files -f build/%name.lang
%endif
%defattr(-,root,root)
/usr/bin/ktorrent
/usr/bin/ktupnptest
/usr/bin/ktmagnetdownloader
%_kde4_modules/ktbwschedulerplugin.so
%_kde4_modules/ktinfowidgetplugin.so
%_kde4_modules/ktipfilterplugin.so
@ -127,7 +124,6 @@ tar xfj %{SOURCE2}
%_kde4_modules/ktupnpplugin.so
%_kde4_modules/ktwebinterfaceplugin.so
%_kde4_modules/ktmediaplayerplugin.so
%_libdir/libbtcore.so.*
%_libdir/libktcore.so.*
%_libdir/libktupnp.so.*
%_kde4_modules/ktdownloadorderplugin.so
@ -139,6 +135,7 @@ tar xfj %{SOURCE2}
/usr/share/icons/hicolor/*/actions/kt-add-filters.*
/usr/share/icons/hicolor/*/actions/kt-remove-feeds.*
/usr/share/icons/hicolor/*/actions/kt-remove-filters.*
/usr/share/icons/hicolor/*/actions/kt-magnet.*
%_kde_share_dir/services/ktdownloadorderplugin.desktop
%_kde_share_dir/services/ktscriptingplugin.desktop
%_kde_share_dir/services/ktsyndicationplugin.desktop
@ -168,7 +165,6 @@ tar xfj %{SOURCE2}
/usr/share/icons/hicolor/*/actions/kt-stop-all.*
/usr/share/icons/hicolor/*/actions/kt-stop.*
/usr/share/icons/hicolor/*/actions/kt-upnp.*
%_kde_share_dir/apps/cmake/modules/FindBTCore.cmake
%_kde_share_dir/apps/ktorrent
%_kde_share_dir/services/ktbwschedulerplugin.desktop
%_kde_share_dir/services/ktinfowidgetplugin.desktop
@ -180,17 +176,18 @@ tar xfj %{SOURCE2}
%_kde_share_dir/services/ktupnpplugin.desktop
%_kde_share_dir/services/ktwebinterfaceplugin.desktop
%_kde_share_dir/services/ktmediaplayerplugin.desktop
%_kde_share_dir/services/magnet.protocol
%_kde_share_dir/servicetypes/ktorrentplugin.desktop
/usr/%_lib/kde4/ktzeroconfplugin.so
/usr/%_lib/kde4/ktshutdownplugin.so
/usr/%_lib/kde4/ktmagnetgeneratorplugin.so
/usr/share/kde4/services/ktzeroconfplugin.desktop
/usr/share/kde4/services/ktshutdownplugin.desktop
/usr/share/kde4/services/ktmagnetgeneratorplugin.desktop
%files devel
%defattr(-,root,root)
%_libdir/libbtcore.so
%_libdir/libktcore.so
%_libdir/libktupnp.so
/usr/include/libbtcore
%changelog

View File

@ -1,19 +0,0 @@
--- libbtcore/tracker/httptracker.cpp
+++ libbtcore/tracker/httptracker.cpp
@@ -456,6 +456,7 @@ namespace bt
md["cookies"] = "none";
// md["accept"] = "text/plain";
md["accept"] = "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2";
+ md["UseProxy"] = QString();
if (proxy_on)
{
QString p = QString("%1:%2").arg(proxy).arg(proxy_port);
@@ -463,8 +464,6 @@ namespace bt
KUrl url = KUrl(p);
if (url.isValid() && proxy.trimmed().length() > 0)
md["UseProxy"] = p;
- else
- md["UseProxy"] = QString();
Out(SYS_TRK|LOG_DEBUG) << "Using proxy : " << md["UseProxy"] << endl;
}

View File

@ -10,7 +10,7 @@ Index: ktorrent/gui.cpp
#include <kio/jobclasses.h>
#include <kio/jobuidelegate.h>
@@ -115,6 +116,8 @@
@@ -116,6 +117,8 @@
//markk.update();
updateActions();
core->startUpdateTimer();
@ -19,15 +19,15 @@ Index: ktorrent/gui.cpp
}
GUI:: ~GUI()
@@ -601,6 +604,11 @@
{
@@ -600,6 +603,11 @@
return torrent_activity;
}
+ void GUI::showDhtTip()
+ {
+ KTipDialog::showTip(this, "ktorrent/dhttip");
+ }
+
+ void GUI::showDhtTip()
+ {
+ KTipDialog::showTip(this, "ktorrent/dhttip");
+ }
}
#include "gui.moc"
@ -63,8 +63,8 @@ Index: ktorrent/CMakeLists.txt
===================================================================
--- ktorrent/CMakeLists.txt (revision 1053967)
+++ ktorrent/CMakeLists.txt (working copy)
@@ -78,5 +78,6 @@
install(FILES ktorrentplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
@@ -89,5 +89,6 @@
install(FILES magnet.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
install(FILES ktorrentui.rc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
install(FILES ktorrent.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
+install(FILES dhttip DESTINATION ${DATA_INSTALL_DIR}/ktorrent)