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

2007-07-05 08:24:06 +00:00 · 2007-07-05 08:24:06 +00:00 · 0536941afc
commit 0536941afc
parent 3999db5b2c
6 changed files with 32 additions and 35 deletions
--- a/FIXME.diff
+++ b/FIXME.diff
@ -1,11 +0,0 @@
--- apps/ktorrent/ktorrent.desktop	2007/06/21 09:07:42	1.1
-+++ apps/ktorrent/ktorrent.desktop	2007/06/21 09:07:50
-@@ -43,7 +43,7 @@
- Icon=ktorrent
- Type=Application
- DocPath=ktorrent/index.html
-MimeType=application/x-bittorrent;application/x-torrent
-+MimeType=application/x-bittorrent;application/x-torrent;
- X-DCOP-ServiceType=Unique
- Comment=A BitTorrent program for KDE
- Comment[ar]=برنامِج BitTorrent لِــ KDE
--- a/ktorrent-2.2.tar.bz2
+++ b/ktorrent-2.2.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a00d5f782827d5b98ad1c064789497a98a73397761ab786bf6f5c2a070facc6
+size 2558452
--- a/ktorrent-2.2rc1.tar.bz2
+++ b/ktorrent-2.2rc1.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:165b3d393aba01fb0b3cb90766aa59d2c4ee793d89603c50baf760a02a82e27a
-size 2542074
--- a/ktorrent.changes
+++ b/ktorrent.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul  4 11:15:14 CEST 2007 - stbinner@suse.de
+
+- update to final 2.2 release
+
 -------------------------------------------------------------------
 Thu Jun 21 11:19:41 CEST 2007 - stbinner@suse.de

--- a/ktorrent.spec
+++ b/ktorrent.spec
@ -1,5 +1,5 @@
 #
-# spec file for package ktorrent (Version 2.2rc1)
+# spec file for package ktorrent (Version 2.2.0)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@ -16,19 +16,18 @@ BuildRequires:  gmp-devel kdelibs3-devel
 BuildRequires:  fdupes
 %endif
 URL:            http://ktorrent.pwsp.net/
-License:        GNU General Public License (GPL)
-Group:          Productivity/Networking/Other
+License:        GPL v2 or later
+Group:          Productivity/Networking/File-Sharing
 Summary:        KDE BitTorrent Client
-Version:        2.2rc1
-Release:        2
+Version:        2.2.0
+Release:        1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%define rversion %{version}
+%define rversion 2.2
 Source:         %{name}-%{rversion}.tar.bz2
 Patch2:         remove-links.diff
 Patch4:         no-geoip-db.diff
 Patch10:        ktorrent-fix-columns.diff
 Patch16:        disable-DHT.diff
-Patch17:        FIXME.diff
 %if %suse_version > 1020
 Requires:       %{name}-lang = %{version}
 %endif
@ -57,7 +56,6 @@ Authors:
 %patch4 -p1
 %patch10
 %patch16
-%patch17
 . /etc/opt/kde3/common_options
 update_admin

@ -113,12 +111,14 @@ kde_post_install
 /opt/kde3/share/apps/*
 /opt/kde3/%_lib/kde3/*
 /opt/kde3/%_lib/libktorrent.*
-/opt/kde3/%_lib/libktorrent-%{version}.so
+/opt/kde3/%_lib/libktorrent-2.2.so
 /opt/kde3/share/config.kcfg/*.kcfg
 /opt/kde3/share/services/*.desktop
 /opt/kde3/share/servicetypes/*.desktop

 %changelog
+* Wed Jul 04 2007 - stbinner@suse.de
+- update to final 2.2 release
 * Thu Jun 21 2007 - stbinner@suse.de
 - run fdupes and kde_post_install, fix invalid .desktop file
 * Sun Jun 17 2007 - stbinner@suse.de
--- a/no-geoip-db.diff
+++ b/no-geoip-db.diff
@ -11,24 +11,27 @@ diff -u -r ktorrent-2.1beta1.orig/plugins/infowidget/Makefile.am ktorrent-2.1bet
 -SUBDIRS = geoip
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
 diff -u -r ktorrent-2.1beta1.orig/plugins/infowidget/peerview.cpp ktorrent-2.1beta1/plugins/infowidget/peerview.cpp
--- ktorrent-2.1beta1.orig/plugins/infowidget/peerview.cpp	2006-11-25 13:49:50.000000000 +0100
-+++ ktorrent-2.1beta1/plugins/infowidget/peerview.cpp	2006-11-25 14:13:31.000000000 +0100
-@@ -45,7 +45,7 @@
- 	static QPixmap no_pix;
+--- ktorrent/plugins/infowidget/peerview.cpp	2007/07/04 09:15:48	1.1
+++ ktorrent/plugins/infowidget/peerview.cpp	2007/07/04 09:17:59
+@@ -53,7 +53,7 @@
 	static QPixmap lock_pix;
+ 	static FlagDB flagDB(22, 18);
 	static bool yes_no_pix_loaded = false;
 -	static bool geoip_db_exists = true;
 +	static bool geoip_db_exists = false;
- 	
+ 	static QString geoip_data_file;
 		
 	PeerViewItem::PeerViewItem(PeerView* pv,kt::PeerInterface* peer) : KListViewItem(pv),peer(peer)
-@@ -56,9 +56,6 @@
+@@ -67,10 +67,10 @@
 			yes_pix = iload->loadIcon("button_ok",KIcon::Small);
 			no_pix = iload->loadIcon("button_cancel",KIcon::Small);
 			lock_pix = iload->loadIcon("ktencrypted",KIcon::Small);
-			geoip_db_exists = !locate("data", "ktorrent/geoip/geoip.dat").isNull(); 
-			if(!geoip_db_exists)
-				geoip_db_exists = !locate("data", "ktorrent/geoip/GeoIP.dat").isNull();
- 			yes_no_pix_loaded = true;
- 		}
- 		
+-#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 = !locate("data", "ktorrent/geoip/geoip.dat").isNull(); 
+ 			if(geoip_db_exists) {
+ 				geoip_data_file = "ktorrent/geoip/geoip.dat";