diff --git a/.gitignore b/.gitignore index ebe78e5..3572f85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libktorrent-1.1.3.tar.bz2 /libktorrent-1.2.0.tar.bz2 +/libktorrent-1.2.1-2.tar.bz2 diff --git a/libktorrent-1.2.0-webseed_deadlock.patch b/libktorrent-1.2.0-webseed_deadlock.patch deleted file mode 100644 index 260cc76..0000000 --- a/libktorrent-1.2.0-webseed_deadlock.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 1ea7a2e39aac91080d36bfc4898af3737270a122 -Author: Joris Guisson -Date: Sun Mar 11 17:44:37 2012 +0100 - - Backport to 1.2: Fix deadlock in webseed code - - CCBUG: 295719 - -diff --git a/src/download/httpconnection.cpp b/src/download/httpconnection.cpp -index f154ad1..34067c4 100644 ---- a/src/download/httpconnection.cpp -+++ b/src/download/httpconnection.cpp -@@ -308,7 +308,6 @@ namespace bt - - float HttpConnection::getDownloadRate() const - { -- QMutexLocker locker(&mutex); - if (sock) - { - sock->updateSpeeds(bt::CurrentTime()); diff --git a/libktorrent.spec b/libktorrent.spec index 7e28ffa..7a66aea 100644 --- a/libktorrent.spec +++ b/libktorrent.spec @@ -1,18 +1,15 @@ Name: libktorrent -Version: 1.2.0 -Release: 3%{?pre}%{?dist} +Version: 1.2.1 +Release: 1%{?pre}%{?dist} Summary: Library providing torrent downloading code Group: System Environment/Libraries License: GPLv2+ URL: http://ktorrent.org/ -Source0: http://ktorrent.org/downloads/4.2.0%{?pre}/libktorrent-%{version}%{?pre}.tar.bz2 +Source0: http://ktorrent.org/downloads/4.2.1%{?pre}/libktorrent-%{version}%{?pre}-2.tar.bz2 ## upstream patches -# https://bugs.kde.org/show_bug.cgi?id=295719 -# https://projects.kde.org/projects/extragear/network/libktorrent/repository/revisions/1ea7a2e39aac91080d36bfc4898af3737270a122 -Patch100: libktorrent-1.2.0-webseed_deadlock.patch BuildRequires: boost-devel BuildRequires: gettext @@ -42,8 +39,6 @@ Requires: gmp-devel%{?_isa} %prep %setup -q -n %{name}-%{version}%{?pre} -%patch100 -p1 -b .webseed_deadlock - %build mkdir -p %{_target_platform} @@ -82,6 +77,9 @@ rm -rf %{buildroot} %changelog +* Tue Jun 12 2012 Alexey Kurov - 1.2.1-1 +- libktorrent-1.2.1-2 + * Mon May 28 2012 Rex Dieter - 1.2.0-3 - -devel: Requires: gmp-devel diff --git a/sources b/sources index e461b11..6f66336 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bd38fc221fe2177dd17b14e2baf60c0 libktorrent-1.2.0.tar.bz2 +20c0e979caa798f49724045edcb3eb0a libktorrent-1.2.1-2.tar.bz2