diff --git a/.gitignore b/.gitignore index b77ee73..85f2187 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /libktorrent-1.1.2.tar.bz2 /libktorrent-1.1.3.tar.bz2 /libktorrent-1.2rc1.tar.bz2 +/libktorrent-1.2.0.tar.bz2 diff --git a/libktorrent-1.2rc1-performance.patch b/libktorrent-1.2rc1-performance.patch deleted file mode 100644 index fc22f7e..0000000 --- a/libktorrent-1.2rc1-performance.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Joris Guisson -Date: Mon, 06 Feb 2012 18:53:31 +0000 -Subject: Disable current open file checking for now, it causes performance issues -X-Git-Url: http://quickgit.kde.org/?p=libktorrent.git&a=commitdiff&h=cd4324dc77d8f28c760a289fa1202749a06806f3 ---- -Disable current open file checking for now, it causes performance issues ---- - - ---- a/src/util/functions.cpp -+++ b/src/util/functions.cpp -@@ -74,37 +74,29 @@ namespace bt - - Uint32 MaxOpenFiles() - { -- struct rlimit lim; -- getrlimit(RLIMIT_NOFILE,&lim); -- return lim.rlim_cur; -+ static Uint32 max_open = 0; -+ if (max_open == 0) -+ { -+ struct rlimit lim; -+ getrlimit(RLIMIT_NOFILE,&lim); -+ max_open = lim.rlim_cur; -+ } -+ -+ return max_open; - } - - Uint32 CurrentOpenFiles() - { --/*#ifdef Q_OS_LINUX -- QString path = QString("/proc/%1/fd").arg(getpid()); -- QDir dir(path); -- int ret = dir.count(); -- if (ret < 0) -- return 0; -- else -- return ret; --#el*/ --#if !defined(Q_OS_WINDOWS) -- Uint32 count = 0; -- struct stat sb; -- int max_fd_number = getdtablesize(); -- for (int i = 0; i < max_fd_number; i++) -- { -- fstat(i, &sb); -- if (errno != EBADF) -- count++; -- } -- -- return count; -+ return 0; -+ /* -+ //return 0; -+#ifdef Q_OS_LINUX -+ QDir dir(QString("/proc/%1/fd").arg(getpid())); -+ return dir.count(); - #else - return 0; - #endif -+ */ - } - - bool OpenFileAllowed() - diff --git a/libktorrent.spec b/libktorrent.spec index 57c6b68..06b94cf 100644 --- a/libktorrent.spec +++ b/libktorrent.spec @@ -1,17 +1,14 @@ -%define pre rc1 +#define pre rc1 Name: libktorrent -Version: 1.2 -Release: 0.4.%{?pre}%{?dist} +Version: 1.2.0 +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%{?pre}/libktorrent-%{version}%{?pre}.tar.bz2 -# fix performance issues -# http://quickgit.kde.org/index.php?p=libktorrent.git&a=commitdiff&h=cd4324dc77d8f28c760a289fa1202749a06806f3 -Patch0: libktorrent-1.2rc1-performance.patch +Source0: http://ktorrent.org/downloads/4.2.0%{?pre}/libktorrent-%{version}%{?pre}.tar.bz2 BuildRequires: boost-devel BuildRequires: gettext BuildRequires: gmp-devel @@ -37,7 +34,6 @@ Requires: kdelibs4-devel%{?_isa} %prep %setup -q -n %{name}-%{version}%{?pre} -%patch0 -p1 %build mkdir -p %{_target_platform} @@ -78,6 +74,9 @@ rm -rf %{buildroot} %changelog +* Mon Mar 5 2012 Alexey Kurov - 1.2.0-1 +- libktorrent-1.2.0 + * Tue Feb 28 2012 Fedora Release Engineering - 1.2-0.4.rc1 - Rebuilt for c++ ABI breakage diff --git a/sources b/sources index 078a3d1..e461b11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ec1adf5b9934b3d5c0ab257c3240280 libktorrent-1.2rc1.tar.bz2 +3bd38fc221fe2177dd17b14e2baf60c0 libktorrent-1.2.0.tar.bz2