rpms/ktorrent/F-10 ktorrent-3.2.1-kdebug#188447.patch, NONE, 1.1 ktorrent.spec, 1.86, 1.87

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17022

Modified Files:
	ktorrent.spec 
Added Files:
	ktorrent-3.2.1-kdebug#188447.patch 
Log Message:
* Tue May 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-3
- crash adjusting speed from systray (kdebug#188447, rhbz#499147)


ktorrent-3.2.1-kdebug#188447.patch:

--- NEW FILE ktorrent-3.2.1-kdebug#188447.patch ---
--- branches/stable/extragear-kde4/network/ktorrent/ktorrent/trayicon.cpp	2009/02/01 09:23:03	919524
+++ branches/stable/extragear-kde4/network/ktorrent/ktorrent/trayicon.cpp	2009/04/06 11:34:48	949983
@@ -360,8 +360,6 @@
 			net::SocketMonitor::setDownloadCap(Settings::maxDownloadRate()*1024);
 		}
 		Settings::self()->writeConfig();
-
-		update();
 	}
 }


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/ktorrent.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- ktorrent.spec	10 Apr 2009 14:05:07 -0000	1.86
+++ ktorrent.spec	31 May 2009 03:25:42 -0000	1.87
@@ -3,7 +3,7 @@
 
 Name:           ktorrent
 Version:        3.2.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -11,11 +11,16 @@ URL:            http://ktorrent.org/
 Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# http://websvn.kde.org/branches/stable/extragear-kde4/network/ktorrent/ktorrent/trayicon.cpp?r1=919524&r2=949983&pathrev=949983&view=patch
+Patch100: ktorrent-3.2.1-kdebug#188447.patch
+
 BuildRequires: avahi-devel
 BuildRequires: cmake   
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gmp-devel
+BuildRequires: GeoIP-devel
 # libtaskmanager support
 BuildRequires: kdebase-workspace-devel
 BuildRequires: kdelibs4-devel >= 4.2.0
@@ -26,7 +31,7 @@ BuildRequires: taglib-devel
 
 %global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 
-Requires: kdelibs4 >= %{kdelibs4_ver} 
+Requires: kdelibs4%{?_isa} >= %{kdelibs4_ver} 
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -45,10 +50,14 @@ The headers and libraries used for devel
 %prep
 %setup -q
 
+%patch100 -p5 -b .kdebug#188447
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+  -DWITH_SYSTEM_GEOIP=1 \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -124,6 +133,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
 %changelog
+* Tue May 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-3
+- crash adjusting speed from systray (kdebug#188447, rhbz#499147)
+
+* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-2
+- -DWITH_SYSTEM_GEOIP=1
+
 * Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-1
 - ktorrent-3.2.1
 - optimize scriptlets