rpm/ktorrent
SHA256
1
0
Fork 0
forked from pool/ktorrent
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=36

Browse Source
This commit is contained in:
OBS User unknown
2008-12-15 13:48:23 +00:00
committed by Git OBS Bridge
parent 198a2aff1c
commit e880042a1d
3 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ktorrent.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 28 11:18:48 CET 2008 - wstephenson@suse.de
- Reinstate geoIP database since license issues resolved
(bnc#188562)
-------------------------------------------------------------------
Sun Nov 16 11:16:09 CET 2008 - stbinner@suse.de

17
ktorrent.spec
View File

@@ -27,15 +27,14 @@ License: GPL v2 or later
Group: Productivity/Networking/File-Sharing
Summary: KDE BitTorrent Client
Version: 3.1.5
Release: 1
Release: 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define rversion %version
Source: %{name}-%{rversion}.tar.bz2
Source2: icons.tar.bz2
Patch2: remove-links.diff
Patch4: no-geoip-db.diff
Patch5: function-address.diff
Patch6: proxy.diff
Patch1: remove-links.diff
Patch2: function-address.diff
Patch3: proxy.diff
%if %suse_version > 1020
Requires: %{name}-lang = %{version}
%endif
@@ -77,10 +76,9 @@ Authors:
%lang_package
%prep
%setup -q -n %{name}-%{version}
%patch1
%patch2
%patch4
%patch5
%patch6
%patch3
tar xfj %{SOURCE2}
%build
@@ -172,6 +170,9 @@ tar xfj %{SOURCE2}
/usr/include/libbtcore
%changelog
* Fri Nov 28 2008 wstephenson@suse.de
- Reinstate geoIP database since license issues resolved
(bnc#188562)
* Sun Nov 16 2008 stbinner@suse.de
- update to version 3.1.5:
* Make sure symlinks work when we create multifile torrents

34
no-geoip-db.diff
View File

@@ -1,34 +0,0 @@
--- plugins/infowidget/peerviewmodel.cpp 2008/03/25 12:17:35 1.1
+++ plugins/infowidget/peerviewmodel.cpp 2008/03/25 12:18:16
@@ -40,7 +40,7 @@
static bool icons_loaded = false;
static GeoIP* geo_ip = 0;
static FlagDB flagDB(22, 18);
- static bool geoip_db_exists = true;
+ static bool geoip_db_exists = false;
static QString geoip_data_file;
@@ -54,10 +54,9 @@
icons_loaded = true;
flagDB.addFlagSource("data", QString("ktorrent/%1.png"));
flagDB.addFlagSource("locale", QString("l10n/%1/flag.png"));
-#ifdef USE_SYSTEM_GEOIP
+#if 0
geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD);
geoip_db_exists = (geo_ip != NULL);
-#else
geoip_db_exists = !KStandardDirs::locate("data", "ktorrent/geoip.dat").isNull();
if(geoip_db_exists)
{
--- plugins/infowidget/CMakeLists.txt 2008/02/19 10:52:14 1.1
+++ plugins/infowidget/CMakeLists.txt 2008/02/19 10:55:36
@@ -25,8 +25,6 @@
set(geoip_src GeoIP.c)
endif(WITH_SYSTEM_GEOIP)
-add_subdirectory(geoip)
-
set(ktinfowidgetplugin_SRC
infowidgetplugin.cpp
iwprefpage.cpp